diff options
| author | Graham Leggett <minfrin@apache.org> | 2011-12-19 18:00:49 +0100 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2011-12-19 18:00:49 +0100 |
| commit | 2cb5dbf51173b720e580412e590c438d5969180f (patch) | |
| tree | ac27c12619512e57f011ca7a917a89f9fbfeb172 /support | |
| parent | Fix warning: variable 'rv' set but not used. (diff) | |
| download | apache2-2cb5dbf51173b720e580412e590c438d5969180f.tar.xz apache2-2cb5dbf51173b720e580412e590c438d5969180f.zip | |
Distinguish properly between the bindir and sbindir directories when
installing binaries. Previously all binaries were silently installed to
sbindir, whether they were system administration commands or not.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220846 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
| -rw-r--r-- | support/Makefile.in | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/support/Makefile.in b/support/Makefile.in index 02d201b47d..b1b29c407e 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -3,8 +3,9 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ CLEAN_TARGETS = suexec -PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm firehose $(NONPORTABLE_SUPPORT) -TARGETS = $(PROGRAMS) +bin_PROGRAMS = htpasswd htdigest htdbm firehose +sbin_PROGRAMS = rotatelogs logresolve ab htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT) +TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS) PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) PROGRAM_DEPENDENCIES = @@ -16,7 +17,13 @@ install: @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) - @for i in apxs apachectl dbmmanage; do \ + @for i in dbmmanage; do \ + if test -f "$(builddir)/$$i"; then \ + cp -p $$i $(DESTDIR)$(bindir); \ + chmod 755 $(DESTDIR)$(bindir)/$$i; \ + fi ; \ + done + @for i in apxs apachectl; do \ if test -f "$(builddir)/$$i"; then \ cp -p $$i $(DESTDIR)$(sbindir); \ chmod 755 $(DESTDIR)$(sbindir)/$$i; \ |