summaryrefslogtreecommitdiff
path: root/source4/dynconfig.mk
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2006-10-22 02:57:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:33 -0500
commit68453d1da2ad68c1e9cb5d42eb71822ae6f0117b (patch)
tree59475927a3a005b806baa5f1d92451e9f3c61c8d /source4/dynconfig.mk
parent7653fa22d961755b1c943e1542cc96466a5cbe75 (diff)
downloadsamba-68453d1da2ad68c1e9cb5d42eb71822ae6f0117b.tar.gz
samba-68453d1da2ad68c1e9cb5d42eb71822ae6f0117b.tar.bz2
samba-68453d1da2ad68c1e9cb5d42eb71822ae6f0117b.zip
r19449: ldbbrowse: installation hopefully works now. "Developer" installations
('configure.developer' or 'configure --enable-developer') may still have problems as I'm not sure I got all of the paths right for that. With the changes Tridge has made to the Main Menu in swat, given a non-developer installation, you should be able to get to ldbbrowse via: JSON/qooxdoo -> ldb browser Derrell (This used to be commit 2406af10791cd8545c598c8591a48de5515c7dc5)
Diffstat (limited to 'source4/dynconfig.mk')
-rw-r--r--source4/dynconfig.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 76479af0fa..ed901a838d 100644
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig.mk
@@ -8,7 +8,8 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
-DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
-DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
- -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
+ -DSWATDIR=\"$(SWATDIR)\" -DSERVICESDIR=\"$(SERVICESDIR)\" \
+ -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
-DTORTUREDIR=\"$(TORTUREDIR)\" \
-DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
@@ -25,9 +26,11 @@ DEVEL_PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(builddir)/bin\" \
-DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(srcdir)/codepages\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
-DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
- -DSWATDIR=\"$(srcdir)/../swat\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
+ -DSWATDIR=\"$(srcdir)/../../swat\" \
+ -DSERVICESDIR=\"$(srcdir)/../../services\"\
+ -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-DMODULESDIR=\"$(builddir)/bin/modules\" \
- -DJSDIR=\"$(srcdir)/scripting/libjs\" \
+ -DJSDIR=\"$(srcdir)/../scripting/libjs\" \
-DSETUPDIR=\"$(srcdir)/setup\" -DTORTUREDIR=\"$(srcdir)/bin/torture\" \
-DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"