[SUBSYSTEM::DYNCONFIG]
-DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o \
- $(dynconfigsrcdir)/version.o
+DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o
# set these to where to find various files
-# These can be overridden by command line switches (see smbd(8))
+# These can be overridden by command line switches (see samba(8))
# or in smb.conf (see smb.conf(5))
-CONFIGFILE = $(sysconfdir)/smb.conf
-PKGCONFIGDIR = $(libdir)/pkgconfig
-LMHOSTSFILE = $(sysconfdir)/lmhosts
+CONFIG4FILE = $(sysconfdir)/smb.conf
+pkgconfigdir = $(libdir)/pkgconfig
+LMHOSTSFILE4 = $(sysconfdir)/lmhosts
-$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(bindir)\" \
- -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
+$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR=\"$(bindir)\" \
+ -DSBINDIR=\"$(sbindir)\" \
+ -DLMHOSTSFILE=\"$(LMHOSTSFILE4)\" \
-DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
-DLOGFILEBASE=\"$(logfilebase)\" \
- -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
- -DSWATDIR=\"$(SWATDIR)\" \
+ -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(ncalrpcdir)\" \
+ -DSWATDIR=\"$(swatdir)\" \
-DPRIVATE_DIR=\"$(privatedir)\" \
- -DMODULESDIR=\"$(modulesdir)\" -DJSDIR=\"$(JSDIR)\" \
- -DTORTUREDIR=\"$(TORTUREDIR)\" \
- -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
-
+ -DMODULESDIR=\"$(modulesdir)\" \
+ -DSETUPDIR=\"$(setupdir)\" \
+ -DWINBINDD_PRIVILEGED_SOCKET_DIR=\"$(winbindd_privileged_socket_dir)\" \
+ -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" \
+ -DNTP_SIGND_SOCKET_DIR=\"$(ntp_signd_socket_dir)\" \
+ -DPYTHONDIR=\"$(pythondir)\"