diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 00:21:20 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 00:21:20 +0100 |
| commit | 1813b711c42a46c86391d0a44dd0be1466fd3b9c (patch) | |
| tree | b5b4c9a6029e3a1c047d83b26b80e3edaad28ca7 /source4/dynconfig.mk | |
| parent | 73be46cf452165555a85986029bf3011120a2b51 (diff) | |
| download | samba-1813b711c42a46c86391d0a44dd0be1466fd3b9c.tar.gz samba-1813b711c42a46c86391d0a44dd0be1466fd3b9c.tar.xz samba-1813b711c42a46c86391d0a44dd0be1466fd3b9c.zip | |
Automatically write AC_SUBST() vars to mkconfig.mk and use them.
(This used to be commit a22bb7725b0b825a90e955f883a34341e9f0f69e)
Diffstat (limited to 'source4/dynconfig.mk')
| -rw-r--r-- | source4/dynconfig.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk index 9c872da3e8..ee5defa6d8 100644 --- a/source4/dynconfig.mk +++ b/source4/dynconfig.mk @@ -4,20 +4,20 @@ OBJ_FILES = dynconfig.o # set these to where to find various files # These can be overridden by command line switches (see smbd(8)) # or in smb.conf (see smb.conf(5)) -CONFIGFILE = $(CONFIGDIR)/smb.conf +CONFIGFILE = $(sysconfdir)/smb.conf PKGCONFIGDIR = $(LIBDIR)/pkgconfig -LMHOSTSFILE = $(CONFIGDIR)/lmhosts +LMHOSTSFILE = $(sysconfdir)/lmhosts PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \ - -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \ - -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \ - -DLOGFILEBASE=\"$(LOGFILEBASE)\" \ - -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \ + -DBINDIR=\"$(bindir)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \ + -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \ + -DLOGFILEBASE=\"$(logfilebase)\" \ + -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \ -DSWATDIR=\"$(SWATDIR)\" \ - -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \ - -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \ + -DPRIVATE_DIR=\"$(privatedir)\" \ + -DMODULESDIR=\"$(modulesdir)\" -DJSDIR=\"$(JSDIR)\" \ -DTORTUREDIR=\"$(TORTUREDIR)\" \ - -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\" + -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" dynconfig.o: dynconfig.c Makefile @echo Compiling $< |