s4:dynconfig: fix the autoconf build and pass -DPYTHONDIR=\"$(pythondir)\"

[metze/samba/wip.git] / source4 / dynconfig / config.mk

diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index 4956fda5196fcba291234073694395c987b261b4..976ca71742baeec7429b582458f5efb967853c2a 100644 (file)
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -1,26 +1,25 @@
 [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)\" \
+        -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)\"
-
+        -DNTP_SIGND_SOCKET_DIR=\"$(ntp_signd_socket_dir)\" \
+        -DPYTHONDIR=\"$(pythondir)\"