diff options
Diffstat (limited to 'devel/makeplus/files')
-rw-r--r-- | devel/makeplus/files/patch-c.mk | 17 | ||||
-rw-r--r-- | devel/makeplus/files/patch-configure.mk | 22 | ||||
-rw-r--r-- | devel/makeplus/files/patch-main.mk | 42 |
3 files changed, 81 insertions, 0 deletions
diff --git a/devel/makeplus/files/patch-c.mk b/devel/makeplus/files/patch-c.mk new file mode 100644 index 000000000000..905e2075ee54 --- /dev/null +++ b/devel/makeplus/files/patch-c.mk @@ -0,0 +1,17 @@ +--- c.mk.orig Mon Dec 9 14:32:33 2002 ++++ c.mk Fri Dec 27 05:10:26 2002 +@@ -13,9 +13,11 @@ + # install make+ separately. + + # General C compilation variables. +-CC = gcc +-CFLAGS = -I. -I.. +-LIBS = ++CC ?= gcc ++CFLAGS += -I. -I.. ++LIBS += ++SETENV ?= /usr/bin/env ++CONF_ENV = CC="$(CC)" CFLAGS="$(CFLAGS)" + + # Link scripts. + MP_LINK_STATIC = $(MAKEPLUS_HOME)/link_static.sh diff --git a/devel/makeplus/files/patch-configure.mk b/devel/makeplus/files/patch-configure.mk new file mode 100644 index 000000000000..3a4b66713d7c --- /dev/null +++ b/devel/makeplus/files/patch-configure.mk @@ -0,0 +1,22 @@ +--- configure.mk.orig Mon Dec 9 14:41:01 2002 ++++ configure.mk Fri Dec 27 05:09:39 2002 +@@ -13,8 +13,13 @@ + # install make+ separately. + + # Configuration scripts. +-MP_CONFIGURE_START = $(MAKEPLUS_HOME)/configure_start.sh > config.h +-MP_CONFIGURE_END = $(MAKEPLUS_HOME)/configure_end.sh >> config.h +-MP_CHECK_HEADERS = $(MAKEPLUS_HOME)/check_headers.sh >> config.h +-MP_CHECK_FUNCS = $(MAKEPLUS_HOME)/check_funcs.sh >> config.h +-MP_CHECK_LIB = $(MAKEPLUS_HOME)/check_lib.sh >> config.h +\ No newline at end of file ++MP_CONFIGURE_START = $(SETENV) $(CONF_ENV) \ ++ $(MAKEPLUS_HOME)/configure_start.sh > config.h ++MP_CONFIGURE_END = $(SETENV) $(CONF_ENV) \ ++ $(MAKEPLUS_HOME)/configure_end.sh >> config.h ++MP_CHECK_HEADERS = $(SETENV) $(CONF_ENV) \ ++ $(MAKEPLUS_HOME)/check_headers.sh >> config.h ++MP_CHECK_FUNCS = $(SETENV) $(CONF_ENV) \ ++ $(MAKEPLUS_HOME)/check_funcs.sh >> config.h ++MP_CHECK_LIB = $(SETENV) $(CONF_ENV) \ ++ $(MAKEPLUS_HOME)/check_lib.sh >> config.h diff --git a/devel/makeplus/files/patch-main.mk b/devel/makeplus/files/patch-main.mk new file mode 100644 index 000000000000..7106b2ff2776 --- /dev/null +++ b/devel/makeplus/files/patch-main.mk @@ -0,0 +1,42 @@ +--- main.mk.orig Mon Dec 16 15:26:30 2002 ++++ main.mk Fri Dec 27 01:21:12 2002 +@@ -33,19 +33,21 @@ + infodir = $(prefix)/info + includedir = $(prefix)/include + pkgdatadir = $(datadir)/$(PACKAGE) ++pkgetcdir = $(sysconfdir)/$(PACKAGE) + pkglibdir = $(libdir)/$(PACKAGE) + pkgincludedir = $(includedir)/$(PACKAGE) +-mandir = $(datadir)/man +-man1dir = $(datadir)/man/man1 +-man2dir = $(datadir)/man/man2 +-man3dir = $(datadir)/man/man3 +-man4dir = $(datadir)/man/man4 +-man5dir = $(datadir)/man/man5 +-man6dir = $(datadir)/man/man6 +-man7dir = $(datadir)/man/man7 +-man8dir = $(datadir)/man/man8 +-manndir = $(datadir)/man/mann +-manldir = $(datadir)/man/manl ++manprefix ?=$(datadir) ++mandir = $(manprefix)/man ++man1dir = $(mandir)/man1 ++man2dir = $(mandir)/man2 ++man3dir = $(mandir)/man3 ++man4dir = $(mandir)/man4 ++man5dir = $(mandir)/man5 ++man6dir = $(mandir)/man6 ++man7dir = $(mandir)/man7 ++man8dir = $(mandir)/man8 ++manndir = $(mandir)/mann ++manldir = $(mandir)/manl + + # Include the other parts of this makefile. + include $(MAKEPLUS_HOME)/configure.mk +@@ -72,4 +74,4 @@ + .EXPORT_ALL_VARIABLES: + + # Phony targets. +-.PHONY: clean distclean +\ No newline at end of file ++.PHONY: clean distclean |