aboutsummaryrefslogtreecommitdiff
path: root/misc/wmwork
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-05-23 16:28:01 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-05-23 16:28:01 +0000
commit494b4c897e9530b0b78e8119ff1ff48be92c64e9 (patch)
tree1d830fecb484945937528371159849ec9ec4083d /misc/wmwork
parentf263195e4885864d6b5ad115d918f3f394ba456e (diff)
downloadports-494b4c897e9530b0b78e8119ff1ff48be92c64e9.tar.gz
ports-494b4c897e9530b0b78e8119ff1ff48be92c64e9.zip
Use explicit do-install-target
Notes
Notes: svn path=/head/; revision=135979
Diffstat (limited to 'misc/wmwork')
-rw-r--r--misc/wmwork/Makefile8
-rw-r--r--misc/wmwork/files/patch-Makefile.in26
2 files changed, 6 insertions, 28 deletions
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile
index b50cbf3c4d1e..f5b0addc689c 100644
--- a/misc/wmwork/Makefile
+++ b/misc/wmwork/Makefile
@@ -22,12 +22,16 @@ USE_GETOPT_LONG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= wmwork.1
PLIST_FILES= bin/wmwork
-CPPFLAGS= -I${X11BASE}/include
+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
LDFLAGS= -L${X11BASE}/lib
+do-install:
+ @${INSTALL_PROGRAM} ${WRKSRC}/wmwork ${PREFIX}/bin/wmwork
+ @${INSTALL_MAN} ${WRKSRC}/wmwork.1 ${MANPREFIX}/man/man1/
+
.include <bsd.port.mk>
diff --git a/misc/wmwork/files/patch-Makefile.in b/misc/wmwork/files/patch-Makefile.in
deleted file mode 100644
index a889238472ad..000000000000
--- a/misc/wmwork/files/patch-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.in.orig Fri May 2 10:29:14 2003
-+++ Makefile.in Fri May 2 10:29:51 2003
-@@ -9,9 +9,11 @@
-
- CC = @CC@
- CFLAGS = -I. @CFLAGS@
-+CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-
- all: wmwork
-
-@@ -22,8 +24,8 @@
- wmgeneral.o: wmgeneral.c wmgeneral.h
-
- install: wmwork wmwork.1
-- $(INSTALL) -D -m 755 wmwork $(DESTDIR)$(bindir)/wmwork
-- $(INSTALL) -D -m 644 wmwork.1 $(DESTDIR)$(mandir)/man1/wmwork.1
-+ $(INSTALL_PROGRAM) wmwork $(DESTDIR)$(bindir)/wmwork
-+ $(INSTALL_DATA) wmwork.1 $(DESTDIR)$(mandir)/man1/wmwork.1
-
- uninstall:
- rm -f $(DESTDIR)$(bindir)/wmwork