summaryrefslogtreecommitdiffstats
path: root/source4/main.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-26 10:18:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:30 -0500
commit8adec6d36373e89c0037105c0867fe6776c45449 (patch)
tree20bf646855b7ddc2d7ed6e1bc71d0c8e70e27e3d /source4/main.mk
parent57d079e4b2f5413a2ef0796b52dc5b5c34097a63 (diff)
downloadsamba-8adec6d36373e89c0037105c0867fe6776c45449.tar.gz
samba-8adec6d36373e89c0037105c0867fe6776c45449.tar.xz
samba-8adec6d36373e89c0037105c0867fe6776c45449.zip
r13158: Fix setup and ejs paths
(This used to be commit c3bc39bd713e2a2b0a270d22e38fe39959a6a7c9)
Diffstat (limited to 'source4/main.mk')
-rw-r--r--source4/main.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/main.mk b/source4/main.mk
index a58729e73be..59dffb4841f 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -83,7 +83,8 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
-DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
-DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
- -DMODULESDIR=\"$(MODULESDIR)\"
+ -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
+ -DSETUPDIR=\"$(SETUPDIR)\"
install: showlayout installbin installdat installswat installmisc installlib \
installheader installpc
@@ -109,7 +110,8 @@ installdirs:
$(DESTDIR)$(LOGFILEBASE) \
$(DESTDIR)$(PRIVATEDIR)/tls \
$(DESTDIR)$(INCLUDEDIR) \
- $(DESTDIR)$(PKGCONFIGDIR)
+ $(DESTDIR)$(PKGCONFIGDIR) \
+ $(DESTDIR)$(CONFIGDIR) \
installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
@$(SHELL) $(srcdir)/script/installbin.sh \