sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Fix installation of misc files.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-09-30 00:29:03 +02:00
parent 2ed71ce6bc
commit f379f67dd2
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pidl/config.mk
View File

@ -1,13 +1,13 @@
PIDL = $(PERL) $(pidldir)/pidl
$(pidldir)/Makefile: $(pidldir)/Makefile.PL
cd $(pidldir) && $(PERL) Makefile.PL PREFIX=$(prefix)
@cd $(pidldir) && $(PERL) Makefile.PL PREFIX=$(prefix)
pidl-testcov: $(pidldir)/Makefile
cd $(pidldir) && cover -test
installpidl:: $(pidldir)/Makefile
$(MAKE) -C $(pidldir) install_vendor VENDORPREFIX=$(prefix) \
@$(MAKE) -C $(pidldir) install_vendor VENDORPREFIX=$(prefix) \
INSTALLVENDORLIB=$(datarootdir)/perl5 \
INSTALLVENDORBIN=$(bindir) \
INSTALLVENDORSCRIPT=$(bindir) \

13
source4/Makefile
View File

@ -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)

3
source4/dynconfig/dynconfig.c
View File

@ -79,9 +79,6 @@ _PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
/** SETUP files (source files used by the provision) */
_PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
/** EJS Javascript library includes */
_PUBLIC_ const char *dyn_JSDIR = JSDIR;
/** Where to find the winbindd socket */
_PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;

6
source4/script/installmisc.sh
View File

@ -3,7 +3,6 @@
SRCDIR="$1"
SETUPDIR="$2"
BINDIR="$3"
cd $SRCDIR || exit 1
@ -25,9 +24,4 @@ cp setup/provision.smb.conf.dc $SETUPDIR || exit 1
cp setup/provision.smb.conf.member $SETUPDIR || exit 1
cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
echo "Installing script tools"
mkdir -p "$BINDIR"
rm -f scripting/bin/*~
cp scripting/bin/* $BINDIR/ || exit 1
exit 0