summaryrefslogtreecommitdiff
path: root/source4/Makefile
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-30 00:29:03 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-30 00:29:03 +0200
commitf379f67dd287292e3bb7b606f1bdc3fe7a8db59c (patch)
treee24e2ded98a3327162bebb4089f05109db8e48b7 /source4/Makefile
parent2ed71ce6bc97cbb9b854bb24ab49001910eda36d (diff)
downloadsamba-f379f67dd287292e3bb7b606f1bdc3fe7a8db59c.tar.gz
samba-f379f67dd287292e3bb7b606f1bdc3fe7a8db59c.tar.bz2
samba-f379f67dd287292e3bb7b606f1bdc3fe7a8db59c.zip
Fix installation of misc files.
Diffstat (limited to 'source4/Makefile')
-rw-r--r--source4/Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 8f31979f21..71529305b4 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -107,6 +107,15 @@ comsrcdir := $(srcdir)/lib/com
include data.mk
+$(foreach SCRIPT,$(wildcard scripting/bin/*),$(eval $(call binary_install_template,$(SCRIPT))))
+
+$(DESTDIR)$(bindir)/%: scripting/bin/% installdirs
+ @mkdir -p $(@D)
+ @echo Installing $(@F) as $@
+ @if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
+ @cp $< $@
+ @chmod $(INSTALLPERMS) $@
+
pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
@@ -232,7 +241,7 @@ installman:: manpages installdirs
@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
installmisc:: installdirs
- @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir)
+ @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir)
installpc:: installdirs
@$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)
@@ -242,7 +251,7 @@ uninstall:: uninstallbin uninstallsbin uninstalldat uninstallmisc uninstalllib u
uninstallmisc::
@echo "Removing MISC files"
- @cd $(DESTDIR)$(bindir); rm -f $(notdir $(miscbinfiles))
+ @rm -rf $(DESTDIR)$(setupdir)/*
$(DESTDIR)$(bindir)/%: bin/% installdirs
@mkdir -p $(@D)