From ab31a4421688142690a7903388abeb0786e7f4f9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 15 Dec 2005 16:32:08 +0000 Subject: r12254: Add some (hopefully correct) descriptions for libraries that are installed. Install pkg-config files. (This used to be commit a86abe84e2cae7c6188c094a92c6b62aace02fdf) --- source4/main.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4/main.mk') diff --git a/source4/main.mk b/source4/main.mk index 74d33c8f32..585265bc24 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -65,6 +65,7 @@ INSTALLPERMS = 0755 # These can be overridden by command line switches (see smbd(8)) # or in smb.conf (see smb.conf(5)) CONFIGFILE = $(CONFIGDIR)/smb.conf +PKGCONFIGDIR = $(LIBDIR)/pkgconfig LMHOSTSFILE = $(CONFIGDIR)/lmhosts PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \ @@ -75,7 +76,7 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \ -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" install: showlayout installbin installdat installswat installmisc installlib \ - installheader + installheader installpc # DESTDIR is used here to prevent packagers wasting their time # duplicating the Makefile. Remove it and you will have the privilege @@ -86,7 +87,7 @@ install: showlayout installbin installdat installswat installmisc installlib \ # is not used. installdirs: - @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(PKGCONFIGDIR) installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) @@ -111,6 +112,9 @@ installman: installdirs installmisc: installdirs @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) +installpc: installdirs + @cp $(PC_FILES) $(DESTDIR)$(PKGCONFIGDIR) + uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader uninstallmisc: -- cgit