Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

[sfrench/samba-autobuild/.git] / source4 / Makefile

diff --git a/source4/Makefile b/source4/Makefile
index 91390d833f885c6cb967ff330cb6b1f93ada74c1..bc470742c66c1f4df2baebeb25fc06333c4920bc 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -8,12 +8,11 @@ default: all
 
 include mkconfig.mk
 
-pidldir := $(srcdir)/pidl
+pidldir := $(srcdir)/../pidl
 
 BASEDIR = $(prefix)
 TORTUREDIR = $(libdir)/torture
 SWATDIR = $(datadir)/swat
-JSDIR = $(datadir)/js
 SETUPDIR = $(datadir)/setup
 NCALRPCDIR = $(localstatedir)/ncalrpc
 
@@ -98,7 +97,6 @@ ntvfssrcdir := ntvfs
 ntptrsrcdir := ntptr
 librpcsrcdir := librpc
 libclisrcdir := libcli
-ejsscriptsrcdir := scripting/ejs
 pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
 ntp_signdsrcdir := ntp_signd
@@ -164,7 +162,6 @@ showlayout::
        @echo '  lockdir:     $(lockdir)'
        @echo '  logfilebase: $(logfilebase)'
        @echo '  setupdir:    $(SETUPDIR)'
-       @echo '  jsdir:       $(JSDIR)'
        @echo '  swatdir:     $(SWATDIR)'
        @echo '  mandir:      $(mandir)'
        @echo '  torturedir:  $(TORTUREDIR)'
@@ -234,7 +231,7 @@ installman:: manpages installdirs
        @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
 
 installmisc:: installdirs
-       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(JSDIR) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
+       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
 
 installpc:: installdirs
        @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)