diff options
| -rw-r--r-- | archivers/nomarch/Makefile | 3 | ||||
| -rw-r--r-- | archivers/nomarch/files/patch-Makefile | 32 |
2 files changed, 1 insertions, 34 deletions
diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile index 5c6885c217c0..c1b64ba81ab1 100644 --- a/archivers/nomarch/Makefile +++ b/archivers/nomarch/Makefile @@ -17,8 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Extracts files from the old `.arc' archive format USE_GETOPT_LONG=yes -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" MAN1= nomarch.1 PLIST_FILES= bin/nomarch diff --git a/archivers/nomarch/files/patch-Makefile b/archivers/nomarch/files/patch-Makefile deleted file mode 100644 index 49bf8d5a6bc1..000000000000 --- a/archivers/nomarch/files/patch-Makefile +++ /dev/null @@ -1,32 +0,0 @@ ---- Makefile.orig Thu Aug 8 21:24:33 2002 -+++ Makefile Sun Jul 6 05:16:01 2003 -@@ -1,13 +1,13 @@ - # Makefile - makefile for nomarch - --CC=gcc --CFLAGS=-O2 -Wall -+CC?= gcc -+CFLAGS?=-O2 -Wall - - # Set BINDIR to directory for binary, - # MANDIR to directory for man page. - # Usually it will be simpler to just set PREFIX. - # --PREFIX=/usr/local -+PREFIX?=/usr/local - BINDIR=$(PREFIX)/bin - MANDIR=$(PREFIX)/man/man1 - -@@ -18,8 +18,11 @@ - - all: nomarch - -+main.o: main.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -o main.o -c main.c -+ - nomarch: $(OBJ) -- $(CC) $(CFLAGS) -o nomarch $(OBJ) -+ $(CC) $(CFLAGS) -o nomarch $(OBJ) $(LDFLAGS) - - installdirs: - /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR) |