diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-09-23 11:15:46 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-09-23 11:15:46 -0700 |
| commit | 66092ced5e1dc4d35923a3c90bcb3214a885b17d (patch) | |
| tree | d40fd46e86244f1b45abda2a95c8fe84bfc88c3c /source4/Makefile | |
| parent | 9cf29abee296ea2fcdf712687a6ce2cf9fd9d74c (diff) | |
| parent | 353aaf26c5f71d9a94e799a1c1e37449211e7a87 (diff) | |
| download | samba-66092ced5e1dc4d35923a3c90bcb3214a885b17d.tar.gz samba-66092ced5e1dc4d35923a3c90bcb3214a885b17d.tar.bz2 samba-66092ced5e1dc4d35923a3c90bcb3214a885b17d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/Makefile')
| -rw-r--r-- | source4/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/Makefile b/source4/Makefile index 7a5ec4c0d0..2a267c3e7b 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -13,7 +13,6 @@ pidldir := $(srcdir)/../pidl BASEDIR = $(prefix) TORTUREDIR = $(libdir)/torture SWATDIR = $(datadir)/swat -JSDIR = $(datadir)/js SETUPDIR = $(datadir)/setup NCALRPCDIR = $(localstatedir)/ncalrpc @@ -98,12 +97,12 @@ ntvfssrcdir := ntvfs ntptrsrcdir := ntptr librpcsrcdir := librpc libclisrcdir := libcli -ejsscriptsrcdir := scripting/ejs pyscriptsrcdir := $(srcdir)/scripting/python kdcsrcdir := kdc ntp_signdsrcdir := ntp_signd wmisrcdir := lib/wmi tallocsrcdir := ../lib/talloc +comsrcdir := $(srcdir)/lib/com include data.mk @@ -164,7 +163,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 +232,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) |