diff options
| -rw-r--r-- | source4/Makefile.in | 2 | ||||
| -rwxr-xr-x | source4/script/installmisc.sh | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index 3d9b1f2add..40ea2868dd 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -243,7 +243,7 @@ installman:: manpages installdirs @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES) installmisc:: installdirs - @$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(privatedir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON) + @$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON) installpc:: installdirs @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES) diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh index 32a2ee4ec6..d1648dd000 100755 --- a/source4/script/installmisc.sh +++ b/source4/script/installmisc.sh @@ -1,19 +1,18 @@ #!/bin/sh # install miscellaneous files -[ $# -eq 8 ] || { - echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR PRIVATEDIR BINDDIR SBINDDIR PYTHONDIR PYTHON" +[ $# -eq 7 ] || { + echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR BINDDIR SBINDDIR PYTHONDIR PYTHON" exit 1 } DESTDIR="$1" SRCDIR="$2" SETUPDIR="$3" -PRIVATEDIR="$4" -BINDIR="$5" -SBINDIR="$6" -PYTHONDIR="$7" -PYTHON="$8" +BINDIR="$4" +SBINDIR="$5" +PYTHONDIR="$6" +PYTHON="$7" cd $SRCDIR || exit 1 @@ -93,7 +92,5 @@ do cp -r ../lib/$p/* $DESTDIR$PYTHONDIR/samba/external/$package/ || exit 1 done -echo "Installing stuff in $PRIVATEDIR" -cp setup/dns_update_list $PRIVATEDIR || exit 1 exit 0 |