remove ludicrous dependency on gnu-make.

fix obvious mistake in makefile location.
regen patches.

art `why does this depend on gnu make ?'
This commit is contained in:
espie 2004-07-19 16:12:36 +00:00
parent d8c03ee19a
commit 52e17ae2d3
7 changed files with 73 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2002/12/29 20:19:10 fgsch Exp $
# $OpenBSD: Makefile,v 1.25 2004/07/19 16:12:36 espie Exp $
COMMENT= "gid/lid tools for looking up variables in code"
@ -28,6 +28,5 @@ post-install:
#
SEPARATE_BUILD= simple
CONFIGURE_STYLE=gnu
USE_GMAKE= Yes
.include <bsd.port.mk>

View File

@ -1,6 +1,7 @@
--- Makefile.in.orig Thu Oct 7 16:58:15 1999
+++ Makefile.in Thu Oct 7 16:58:22 1999
@@ -95,7 +95,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2004/07/19 16:12:36 espie Exp $
--- Makefile.in.orig Tue Apr 6 10:28:35 1999
+++ Makefile.in Mon Jul 19 18:02:48 2004
@@ -95,7 +95,7 @@ lispdir = @lispdir@
AUTOMAKE_OPTIONS = gnits 1.2h

View File

@ -1,6 +1,7 @@
--- lisp/elisp-comp.orig Thu Oct 7 16:57:37 1999
+++ lisp/elisp-comp Thu Oct 7 16:58:03 1999
@@ -34,7 +34,7 @@
$OpenBSD: patch-lisp_elisp-comp,v 1.1 2004/07/19 16:12:36 espie Exp $
--- lisp/elisp-comp.orig Fri Apr 18 08:43:32 1997
+++ lisp/elisp-comp Mon Jul 19 18:02:48 2004
@@ -34,7 +34,7 @@ else
cd $tempdir
echo "(setq load-path (cons nil load-path))" > script

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-m4_Makefile_am,v 1.1 2004/07/19 16:12:36 espie Exp $
--- m4/Makefile.am.orig Mon Jul 19 18:01:09 2004
+++ m4/Makefile.am Mon Jul 19 18:01:37 2004
@@ -7,13 +7,13 @@ lcmessage.m4 \
progtest.m4
##m4-files-end
-Makefile.am: Makefile.am.in
+$(srcdir)/Makefile.am: Makefile.am.in
rm -f $@ $@t
- sed -n '1,/^##m4-files-begin/p' $< > $@t
+ sed -n '1,/^##m4-files-begin/p' Makefile.am.in > $@t
( (echo EXTRA_DIST = README Makefile.am.in | tr '\012' @); \
(echo *.m4|tr ' ' @) ) \
|sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
>> $@t
- sed -n '/^##m4-files-end/,$$p' $< >> $@t
+ sed -n '/^##m4-files-end/,$$p' Makefile.am.in >> $@t
chmod a-w $@t
mv $@t $@

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-m4_Makefile_am_in,v 1.1 2004/07/19 16:12:36 espie Exp $
--- m4/Makefile.am.in.orig Mon Jul 19 18:01:09 2004
+++ m4/Makefile.am.in Mon Jul 19 18:02:01 2004
@@ -3,13 +3,13 @@
##m4-files-begin
##m4-files-end
-Makefile.am: Makefile.am.in
+$(srcdir)/Makefile.am: Makefile.am.in
rm -f $@ $@t
- sed -n '1,/^##m4-files-begin/p' $< > $@t
+ sed -n '1,/^##m4-files-begin/p' Makefile.am.in > $@t
( (echo EXTRA_DIST = README Makefile.am.in | tr '\012' @); \
(echo *.m4|tr ' ' @) ) \
|sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
>> $@t
- sed -n '/^##m4-files-end/,$$p' $< >> $@t
+ sed -n '/^##m4-files-end/,$$p' Makefile.am.in >> $@t
chmod a-w $@t
mv $@t $@

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-m4_Makefile_in,v 1.1 2004/07/19 16:12:36 espie Exp $
--- m4/Makefile.in.orig Mon Jul 19 18:02:05 2004
+++ m4/Makefile.in Mon Jul 19 18:02:28 2004
@@ -194,14 +194,14 @@ distclean-generic clean-generic maintain
mostlyclean distclean maintainer-clean
-Makefile.am: Makefile.am.in
+$(srcdir)/Makefile.am: Makefile.am.in
rm -f $@ $@t
- sed -n '1,/^##m4-files-begin/p' $< > $@t
+ sed -n '1,/^##m4-files-begin/p' Makefile.am.in > $@t
( (echo EXTRA_DIST = README Makefile.am.in | tr '\012' @); \
(echo *.m4|tr ' ' @) ) \
|sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
>> $@t
- sed -n '/^##m4-files-end/,$$p' $< >> $@t
+ sed -n '/^##m4-files-end/,$$p' Makefile.am.in >> $@t
chmod a-w $@t
mv $@t $@

View File

@ -1,5 +1,6 @@
--- po/Makefile.in.in.orig Sun Apr 9 16:13:52 2000
+++ po/Makefile.in.in Sun Apr 9 16:14:28 2000
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2004/07/19 16:12:36 espie Exp $
--- po/Makefile.in.in.orig Fri Apr 18 08:43:34 1997
+++ po/Makefile.in.in Mon Jul 19 18:02:48 2004
@@ -124,9 +124,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all