$NetBSD: patch-aa,v 1.4 2017/08/19 00:22:12 jlam Exp $ --- Makefile.bsd.in.orig 1999-09-13 06:32:44.000000000 +0000 +++ Makefile.bsd.in @@ -101,11 +101,11 @@ CPPFLAGS := -Iinclude @CPPFLAGS@ ST_CPPFLAGS := SH_CPPFLAGS := -D_CPPFLAGS := -D_LIBSTASH_DBG +D_CPPFLAGS := O_CPPFLAGS := P_CPPFLAGS := R_CPPFLAGS := -D_CW_REENTRANT -TEST_CPPFLAGS := -D_LIBSTASH_DEBUG +TEST_CPPFLAGS := CFLAGS := -Wall -pipe @CFLAGS@ ST_CFLAGS := @@ -290,47 +290,48 @@ install_r : install_stat_dbg_r install_s install_common : all $(SHELL) -c \ - '@INSTALL@ -d @prefix@/include/libstash; \ + '@INSTALL@ -d ${DESTDIR}@prefix@/include/libstash; \ for i in $(INCS); do \ - @INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \ + @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \ done; \ - @INSTALL@ -d @prefix@/man/man3; \ + @INSTALL@ -d ${DESTDIR}@prefix@/${PKGMANDIR}/man3; \ for i in $(MANPAGES); do \ - @INSTALL@ -m 0644 $$i @prefix@/man/man3/; \ + f=$${i#man/}; \ + @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/${PKGMANDIR}/$${f%s}; \ done; \ - @INSTALL@ -d @prefix@/lib; \ + @INSTALL@ -d ${DESTDIR}@prefix@/lib; \ ' install_common_r : install_common $(SHELL) -c \ 'for i in $(INCS_R); do \ - @INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \ + @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \ done; \ ' install_stat_dbg : stat_dbg install_common - @INSTALL@ -m 0444 $(LIB_ST_D) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_ST_D) ${DESTDIR}@prefix@/lib install_stat_opt : stat_opt install_common - @INSTALL@ -m 0444 $(LIB_ST_O) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_ST_O) ${DESTDIR}@prefix@/lib install_shar_opt : shar_opt install_common - @INSTALL@ -m 0444 $(LIB_SH_O) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_SH_O) ${DESTDIR}@prefix@/lib install_stat_prof : stat_prof install_common - @INSTALL@ -m 0444 $(LIB_ST_P) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_ST_P) ${DESTDIR}@prefix@/lib install_stat_dbg_r : stat_dbg_r install_common install_common_r - @INSTALL@ -m 0444 $(LIB_ST_R_D) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_ST_R_D) ${DESTDIR}@prefix@/lib install_stat_opt_r : stat_opt_r install_common install_common_r - @INSTALL@ -m 0444 $(LIB_ST_R_O) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_ST_R_O) ${DESTDIR}@prefix@/lib install_shar_opt_r : shar_opt_r install_common install_common_r - @INSTALL@ -m 0444 $(LIB_SH_R_O) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_SH_R_O) ${DESTDIR}@prefix@/lib install_stat_prof_r : stat_prof_r install_common install_common_r - @INSTALL@ -m 0444 $(LIB_ST_R_P) @prefix@/lib + @INSTALL@ -m 0444 $(LIB_ST_R_P) ${DESTDIR}@prefix@/lib uninstall : rm -f @prefix@/lib/lib$(LIB)*