mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-10 04:50:03 -04:00
102 lines
3.6 KiB
Plaintext
102 lines
3.6 KiB
Plaintext
$NetBSD: patch-aa,v 1.14 2005/02/09 14:57:52 tron Exp $
|
|
|
|
--- Makefile.in.orig 2004-11-24 19:31:09.000000000 +0000
|
|
+++ Makefile.in 2005-02-09 13:55:40.000000000 +0000
|
|
@@ -4,7 +4,7 @@
|
|
|
|
PROGRAM_NAME = $(progname)
|
|
PROGRAM_SOURCES = modules.c
|
|
-PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
|
|
+PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
|
|
PROGRAM_DEPENDENCIES = \
|
|
$(BUILTIN_LIBS) \
|
|
$(MPM_LIB) \
|
|
@@ -14,7 +14,7 @@
|
|
PROGRAMS = $(PROGRAM_NAME)
|
|
TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
|
|
PHONY_TARGETS = $(srcdir)/buildmark.c
|
|
-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
|
|
+INSTALL_TARGETS = install-htdocs install-error install-icons \
|
|
install-other install-cgi install-include install-suexec install-man \
|
|
install-build
|
|
|
|
@@ -71,6 +71,7 @@
|
|
< $$i; \
|
|
fi \
|
|
) > $(DESTDIR)$(sysconfdir)/$$i; \
|
|
+ if false; then \
|
|
chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
|
|
file=`echo $$i|sed s/-std//`; \
|
|
if [ "$$file" = "httpd.conf" ]; then \
|
|
@@ -79,13 +80,16 @@
|
|
if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
|
|
$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
|
|
fi; \
|
|
+ fi; \
|
|
done ; \
|
|
done ; \
|
|
if test -f "$(builddir)/envvars-std"; then \
|
|
cp -p envvars-std $(DESTDIR)$(sbindir); \
|
|
+ if false; then \
|
|
if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
|
|
cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
|
|
fi ; \
|
|
+ fi ; \
|
|
fi
|
|
|
|
install-build:
|
|
@@ -93,8 +97,6 @@
|
|
@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
|
|
@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
|
|
cp build/*.mk $(DESTDIR)$(installbuilddir); \
|
|
- sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
|
|
- build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
|
|
cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
|
|
cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
|
|
|
|
@@ -108,7 +110,7 @@
|
|
doxygen $(top_srcdir)/docs/doxygen.conf
|
|
|
|
install-htdocs:
|
|
- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
|
|
+ -@if false; then \
|
|
echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
|
|
else \
|
|
echo Installing HTML documents ; \
|
|
@@ -118,7 +120,7 @@
|
|
fi
|
|
|
|
install-error:
|
|
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
|
|
+ -@if false; then \
|
|
echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
|
|
else \
|
|
echo Installing error documents ; \
|
|
@@ -128,7 +130,7 @@
|
|
fi
|
|
|
|
install-icons:
|
|
- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
|
|
+ -@if false; then \
|
|
echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
|
|
else \
|
|
echo Installing icons ; \
|
|
@@ -138,7 +140,7 @@
|
|
fi
|
|
|
|
install-cgi:
|
|
- -@if [ -d $(DESTDIR)$(cgidir) ];then \
|
|
+ -@if false; then \
|
|
echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
|
|
else \
|
|
echo Installing CGIs ; \
|
|
@@ -191,8 +193,6 @@
|
|
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
|
|
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
|
|
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
|
|
- @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
|
|
- @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
|
|
|
|
install-suexec:
|
|
@if test -f $(builddir)/support/suexec; then \
|