diff options
| -rw-r--r-- | sysutils/di/files/patch-C-Makefile | 22 | ||||
| -rw-r--r-- | sysutils/di/files/patch-Makefile | 10 |
2 files changed, 16 insertions, 16 deletions
diff --git a/sysutils/di/files/patch-C-Makefile b/sysutils/di/files/patch-C-Makefile index 413fe7f7e1b8..e9dce64c5b1c 100644 --- a/sysutils/di/files/patch-C-Makefile +++ b/sysutils/di/files/patch-C-Makefile @@ -1,7 +1,7 @@ ---- C/Makefile.orig 2011-01-01 15:25:04.000000000 -0500 -+++ C/Makefile 2011-01-02 15:29:46.000000000 -0500 +--- C/Makefile.orig 2015-05-18 19:48:09 UTC ++++ C/Makefile @@ -6,7 +6,7 @@ - # $Id: Makefile,v 1.109 2010-12-31 21:15:39-08 bll Exp $ + # $Id$ # -CC = cc @@ -9,30 +9,30 @@ # for tests.done DC = gdc -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ TEST = test ### # installation options # -prefix = /usr/local +prefix ?= /usr/local LOCALEDIR = $(prefix)/share/locale - PROG = di - MPROG = mi -@@ -145,7 +145,7 @@ + + ### +@@ -141,7 +141,7 @@ bsd43-cc: $(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \ CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \ CFLAGS="$(CFLAGS) -O" \ - LDFLAGS="-O" di-programs + LDFLAGS="-O $(LDFLAGS)" di-programs + .PHONY: bsd43-gcc bsd43-gcc: - @$(MAKE) ../dioptions.dat -@@ -156,7 +156,7 @@ +@@ -155,7 +155,7 @@ bsd43-gcc: $(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \ CC=gcc LD=gcc EXE_EXT="" OBJ_EXT=".o" \ CFLAGS="$(CFLAGS) -O2" \ - LDFLAGS="-O2" di-programs + LDFLAGS="-O2 $(LDFLAGS)" di-programs - ### - # cleaning + .PHONY: ultrix-cc + ultrix-cc: diff --git a/sysutils/di/files/patch-Makefile b/sysutils/di/files/patch-Makefile index 934cc3c12943..9b8cb9ce3536 100644 --- a/sysutils/di/files/patch-Makefile +++ b/sysutils/di/files/patch-Makefile @@ -1,6 +1,6 @@ ---- ./Makefile.orig 2014-02-15 12:14:49.000000000 -0500 -+++ ./Makefile 2014-03-31 20:03:46.000000000 -0400 -@@ -36,12 +36,12 @@ +--- Makefile.orig 2015-05-18 19:48:09 UTC ++++ Makefile +@@ -36,12 +36,12 @@ MKC_DIR = ./mkconfig ### # installation options # @@ -15,7 +15,7 @@ INSTALL_BIN_DIR = $(INSTALL_DIR)/bin INST_LOCALEDIR = $(INSTALL_DIR)/share/locale TARGET = $(INSTALL_BIN_DIR)/$(PROG)$(EXE_EXT) -@@ -58,7 +58,7 @@ +@@ -58,7 +58,7 @@ INSTPERM = 4111 # install suid if your # # simple man page installation # @@ -24,7 +24,7 @@ DI_MANDIR = $(DI_MANINSTDIR)/man1 MAN_TARGET = $(PROG).1 MANPERM = 644 -@@ -140,7 +140,7 @@ +@@ -140,7 +140,7 @@ install-prog: $(TEST) -d $(INSTALL_BIN_DIR) || $(MKDIR) $(INSTALL_BIN_DIR) $(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(TARGET) -$(RM) -f $(MTARGET) > /dev/null 2>&1 |