diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-13 02:05:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:07 -0500 |
| commit | 3cad0b87dc55f8eab9b00cd3aa01e817b39a5d62 (patch) | |
| tree | 4d5c121cfc179a40e944b8bca60f9df32fbd97c2 /source4/main.mk | |
| parent | a1b295ed4823ce8d06f830b8db9a5d965c934b54 (diff) | |
| download | samba-3cad0b87dc55f8eab9b00cd3aa01e817b39a5d62.tar.gz samba-3cad0b87dc55f8eab9b00cd3aa01e817b39a5d62.tar.bz2 samba-3cad0b87dc55f8eab9b00cd3aa01e817b39a5d62.zip | |
r14281: Pull apart LIBDIR and MODULESDIR
Move architecture-independent data to DATADIR (was LIBDIR)
(This used to be commit 2c7b62a861f702067e8df4c3239ac7e377631a15)
Diffstat (limited to 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/main.mk b/source4/main.mk index 28d4748edf..5ffdc58e47 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -57,6 +57,7 @@ showlayout: @echo ' jsdir: $(JSDIR)' @echo ' swatdir: $(SWATDIR)' @echo ' mandir: $(MANDIR)' + @echo ' datadir: $(DATADIR)' @echo ' winbindd_socket_dir: $(WINBINDD_SOCKET_DIR)' showflags: @@ -79,7 +80,7 @@ LMHOSTSFILE = $(CONFIGDIR)/lmhosts PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \ -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \ - -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DLIBDIR=\"$(LIBDIR)\" \ + -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \ -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \ -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \ @@ -103,8 +104,10 @@ installdirs: $(DESTDIR)$(BINDIR) \ $(DESTDIR)$(SBINDIR) \ $(DESTDIR)$(LIBDIR) \ + $(DESTDIR)$(MODULESDIR) \ $(DESTDIR)$(VARDIR) \ $(DESTDIR)$(PRIVATEDIR) \ + $(DESTDIR)$(DATADIR) \ $(DESTDIR)$(PIDDIR) \ $(DESTDIR)$(LOCKDIR) \ $(DESTDIR)$(LOGFILEBASE) \ @@ -137,10 +140,10 @@ installheader: headers installdirs @$(SHELL) $(srcdir)/script/installheader.sh $(DESTDIR)$(INCLUDEDIR) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS) installdat: installdirs - @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir) + @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(DATADIR) $(srcdir) installswat: installdirs - @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) $(DESTDIR)$(LIBDIR) + @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) installman: installdirs @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES) |