diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-16 23:09:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:14 -0500 |
| commit | b58deeea692fc28827e249f0fc4a9d39263a4095 (patch) | |
| tree | b4e7ddc76fd026977803d4d067dc307e7e9d48e7 /source4/main.mk | |
| parent | c2d6fad69bc42c0d7c261282797ca8baf9e9aad2 (diff) | |
| download | samba-b58deeea692fc28827e249f0fc4a9d39263a4095.tar.gz samba-b58deeea692fc28827e249f0fc4a9d39263a4095.tar.bz2 samba-b58deeea692fc28827e249f0fc4a9d39263a4095.zip | |
r19350: Properly list LOCAL-TALLOC under the "LOCAL" header.
Support directories for subcategories in tests.
Several small other fixes.
(This used to be commit bde00d97068d559b025ab131ff698a82430d14b3)
Diffstat (limited to 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/main.mk b/source4/main.mk index 42c471da80..3767ecab10 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -136,12 +136,9 @@ installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs $(DESTDIR)$(LIBDIR) \ $(DESTDIR)$(VARDIR) \ $(BIN_PROGS) - @$(SHELL) $(srcdir)/script/installbin.sh \ + @$(SHELL) $(srcdir)/script/installtorture.sh \ $(INSTALLPERMS) \ - $(DESTDIR)$(BASEDIR) \ $(DESTDIR)$(TORTUREDIR) \ - $(DESTDIR)$(LIBDIR) \ - $(DESTDIR)$(VARDIR) \ $(TORTURE_PROGS) installlib: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs @@ -175,7 +172,7 @@ uninstallmisc: uninstallbin: @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(SBIN_PROGS) @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(BIN_PROGS) - @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(TORTUREDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(TORTURE_PROGS) + @$(SHELL) $(srcdir)/script/uninstalltorture.sh $(DESTDIR)$(TORTUREDIR) $(TORTURE_PROGS) uninstalllib: @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR) $(SHARED_LIBS) |