diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 13:10:11 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 13:10:11 +0100 |
| commit | e4165448d778db1721b1c7670b25ae3e40917d86 (patch) | |
| tree | 027b825fa742c1dbb97874c179cdeea6dba92a58 /source4/dynconfig.mk | |
| parent | cac225ba7daf8d88d858292902480415f0fa00e2 (diff) | |
| parent | de03c4a3eadd8180e5bda5b176f1abebff613a15 (diff) | |
| download | samba-e4165448d778db1721b1c7670b25ae3e40917d86.tar.gz samba-e4165448d778db1721b1c7670b25ae3e40917d86.tar.bz2 samba-e4165448d778db1721b1c7670b25ae3e40917d86.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
(This used to be commit 35f5c8294e9f3b304987597d4bcfc75fdda05982)
Diffstat (limited to 'source4/dynconfig.mk')
| -rw-r--r-- | source4/dynconfig.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk index 9c872da3e8..e970d4cd4c 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 -PKGCONFIGDIR = $(LIBDIR)/pkgconfig -LMHOSTSFILE = $(CONFIGDIR)/lmhosts +CONFIGFILE = $(sysconfdir)/smb.conf +PKGCONFIGDIR = $(libdir)/pkgconfig +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 $< |