diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-09-10 14:09:07 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-09-10 14:09:07 +1000 |
| commit | 9bc4d3ecba6395be2dff195fdc1ae74d07155a42 (patch) | |
| tree | 354e6216080b6e21cdc2ff2e5368ee4a99aa535b /source4/Makefile | |
| parent | ba22de3d4fcba466d2829df47fb05c85eda2f98f (diff) | |
| parent | ce288824bb4a095c5020449a79eb83fad81e8480 (diff) | |
| download | samba-9bc4d3ecba6395be2dff195fdc1ae74d07155a42.tar.gz samba-9bc4d3ecba6395be2dff195fdc1ae74d07155a42.tar.bz2 samba-9bc4d3ecba6395be2dff195fdc1ae74d07155a42.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit ed26195d0eda6dd1ca14508cfd31a48dde79d44f)
Diffstat (limited to 'source4/Makefile')
| -rw-r--r-- | source4/Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source4/Makefile b/source4/Makefile index d91d08a252..66b092192e 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -210,11 +210,7 @@ installdirs:: $(DESTDIR)$(PKGCONFIGDIR) \ $(DESTDIR)$(sysconfdir) -installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs - @$(SHELL) $(srcdir)/script/installtorture.sh \ - $(INSTALLPERMS) \ - $(DESTDIR)$(TORTUREDIR) \ - $(TORTURE_PROGS) +installbin:: installdirs installplugins:: @@ -262,9 +258,6 @@ $(DESTDIR)$(sbindir)/%: bin/% installdirs @chmod $(INSTALLPERMS) $@ uninstallbin:: - @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(SBIN_PROGS) - @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(BIN_PROGS) - @$(SHELL) $(srcdir)/script/uninstalltorture.sh $(DESTDIR)$(TORTUREDIR) $(TORTURE_PROGS) uninstalllib:: @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(libdir) $(SHARED_LIBS) |