head 1.2; access; symbols pkgsrc-2018Q2:1.1.0.2 pkgsrc-2018Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2018.07.25.16.19.16; author schmonz; state dead; branches; next 1.1; commitid 5nc1IqK8e0KRhxLA; 1.1 date 2018.06.18.10.54.31; author schmonz; state Exp; branches; next ; commitid lKl5ZIxrJ269GKGA; desc @@ 1.2 log @Use external destdir patch. Add CONFLICTS with ucspi-tcp6, to be added shortly. @ text @$NetBSD: patch-Makefile,v 1.1 2018/06/18 10:54:31 schmonz Exp $ DESTDIR support. --- Makefile.orig 2018-06-18 10:52:34.000000000 +0000 +++ Makefile @@@@ -36,6 +36,14 @@@@ auto-str.o: \ compile auto-str.c buffer.h readwrite.h exit.h ./compile auto-str.c +auto_destdir.c: \ +auto-str conf-destdir + ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c + +auto_destdir.o: \ +compile auto_destdir.c + ./compile auto_destdir.c + auto_home.c: \ auto-str conf-home ./auto-str auto_home `head -1 conf-home` > auto_home.c @@@@ -351,16 +359,16 @@@@ warn-auto.sh http@@.sh conf-home chmod 755 http@@ install: \ -load install.o hier.o auto_home.o unix.a byte.a - ./load install hier.o auto_home.o unix.a byte.a +load install.o hier.o auto_destdir.o unix.a byte.a + ./load install hier.o auto_destdir.o unix.a byte.a install.o: \ compile install.c buffer.h strerr.h error.h open.h readwrite.h exit.h ./compile install.c instcheck: \ -load instcheck.o hier.o auto_home.o unix.a byte.a - ./load instcheck hier.o auto_home.o unix.a byte.a +load instcheck.o hier.o auto_destdir.o unix.a byte.a + ./load instcheck hier.o auto_destdir.o unix.a byte.a instcheck.o: \ compile instcheck.c strerr.h error.h readwrite.h exit.h @ 1.1 log @Modernize patch filename. No functional change intended. @ text @d1 1 a1 1 $NetBSD$ @