You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Ian Holsman <ia...@cnet.com> on 2001/09/04 17:52:55 UTC
Re: cvs commit: httpd-2.0/support Makefile.in
rbb@apache.org wrote:
> rbb 01/09/02 20:27:48
>
> Modified: build rules.mk.in
> support Makefile.in
> Log:
> Make Apache 2.0 install all files in the same location as Apache 1.3
> did.
> PR: 7626
>
> Revision Changes Path
> 1.4 +2 -2 httpd-2.0/build/rules.mk.in
>
> Index: rules.mk.in
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/build/rules.mk.in,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- rules.mk.in 2001/08/31 17:02:23 1.3
> +++ rules.mk.in 2001/09/03 03:27:48 1.4
> @@ -197,9 +197,9 @@
>
> local-install: $(TARGETS) $(SHARED_TARGETS) $(INSTALL_TARGETS)
> @if test -n '$(PROGRAMS)'; then \
> - test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
> + test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
> list='$(PROGRAMS)'; for i in $$list; do \
> - $(INSTALL_PROGRAM) $$i $(bindir); \
> + $(INSTALL_PROGRAM) $$i $(sbindir); \
> done; \
> fi
>
>
>
>
> 1.21 +5 -5 httpd-2.0/support/Makefile.in
>
> Index: Makefile.in
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
> retrieving revision 1.20
> retrieving revision 1.21
> diff -u -r1.20 -r1.21
> --- Makefile.in 2001/07/09 02:31:09 1.20
> +++ Makefile.in 2001/09/03 03:27:48 1.21
> @@ -13,12 +13,12 @@
>
> install:
> @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
> - @cp -p $(top_srcdir)/server/httpd.exp $(bindir)
> - @cp -p apachectl $(bindir)
> - chmod 755 $(bindir)/apachectl
> + @cp -p $(top_srcdir)/server/httpd.exp $(libexecdir)
> + @cp -p apachectl $(sbindir)
hi Ryan.
is this right??
every 1.3 install I remember always put these in apache/bin
If it is right,
you need to modify apachectl so that HTTPD points to apache/sbin
instead of bin.
..Ian
> + chmod 755 $(sbindir)/apachectl
> @if test -f $(builddir)/apxs; then \
> - cp -p apxs $(bindir); \
> - chmod 755 $(bindir)/apxs; \
> + cp -p apxs $(sbindir); \
> + chmod 755 $(sbindir)/apxs; \
> fi
>
> htpasswd_OBJECTS = htpasswd.lo
>
>
>
>