diff options
| author | Joe Orton <jorton@apache.org> | 2005-06-13 12:49:58 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2005-06-13 12:49:58 +0000 |
| commit | b8274244fa9e8759450e5f421130bd5f6db3c9f4 (patch) | |
| tree | ee0856ff2aca308e10f689f448b11e2ff5b4a9e3 /Makefile.in | |
| parent | 89cf09257e3e2519e3c3b26a42f835a8e1438ce8 (diff) | |
| download | httpd-b8274244fa9e8759450e5f421130bd5f6db3c9f4.tar.gz | |
Sanitize the installed config_vars.mk to remove references to the
build and source directories, and to remove variables which are
internal to the httpd build system:
* build/config_vars.sh.in: New file.
* Makefile.in (build/config_vars.out): New target.
(install-build): Install build/config_vars.out as config_vars.mk.
* configure.in: Add include path for srclib/pcre to INCLUDES rather
than CPPFLAGS, and use a topdir-relative not absolute path name.
Generate build/config_vars.sh.
Reviewed by: Paul Querna
PR: 20874, 28145
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190392 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 8bbbc30275..c565254927 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,7 @@ INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \ DISTCLEAN_TARGETS = include/ap_config_auto.h include/ap_config_layout.h \ modules.c config.cache config.log config.status build/config_vars.mk \ build/rules.mk docs/conf/httpd.conf docs/conf/extra/*.conf shlibtool \ - build/pkg/pkginfo + build/pkg/pkginfo build/config_vars.sh EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \ httpd.spec @@ -85,7 +85,11 @@ install-conf: fi ; \ fi -install-build: +# Create a sanitized config_vars.mk +build/config_vars.out: build/config_vars.mk + @$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out + +install-build: build/config_vars.out @echo Installing build system files @$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) @for f in $(top_srcdir)/build/*.mk build/*.mk; do \ @@ -96,8 +100,8 @@ install-build: $(top_srcdir)/build/instdso.sh; do \ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \ done - @sed "/^LIBTOOL/s#/[^ ]*/libtool \(.*\)#`$(APR_CONFIG) --apr-libtool` $(LTFLAGS)#" \ - build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk + @$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk + @rm build/config_vars.out htdocs-srcdir = $(top_srcdir)/docs/docroot |