From 707909bbdc9e883b1f4321903aad07cdb3b1d45d Mon Sep 17 00:00:00 2001 From: vanilla Date: Fri, 10 Jan 2014 09:32:14 +0000 Subject: Support stagedir. Approved by: portmgr (blanket infrastructure) --- x11/deskmenu/Makefile | 3 +-- x11/deskmenu/files/patch-Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'x11/deskmenu') diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile index b55aceb8ac83..5902fe5f3fed 100644 --- a/x11/deskmenu/Makefile +++ b/x11/deskmenu/Makefile @@ -16,8 +16,7 @@ USES= gmake USE_GNOME= gtk12 USE_CSTD= gnu89 -NO_STAGE= yes post-install: - ${STRIP_CMD} ${PREFIX}/bin/deskmenu + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/deskmenu .include diff --git a/x11/deskmenu/files/patch-Makefile b/x11/deskmenu/files/patch-Makefile index 51243cf6b1f8..ebf5b6df1902 100644 --- a/x11/deskmenu/files/patch-Makefile +++ b/x11/deskmenu/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sun Jan 19 15:41:43 2003 -+++ Makefile Sun Jan 19 15:42:30 2003 +--- Makefile.orig 2001-05-22 18:44:52.000000000 +0800 ++++ Makefile 2014-01-10 14:41:23.000000000 +0800 @@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -g -O2 -Wall `gtk-config --cflags` @@ -12,7 +12,7 @@ LDPATH = -L$(XROOT)/lib PROG = deskmenu -@@ -10,7 +9,6 @@ +@@ -10,7 +9,6 @@ HEADERS = $(PROG).h RCFILE = -DRCFILE=\".deskmenurc\" DEBUG = #-DDEBUG DEFINES = $(RCFILE) $(DEBUG) @@ -20,12 +20,12 @@ OBJS = $(PROG).o popup.o workspaces.o windows.o -@@ -23,7 +21,7 @@ +@@ -23,7 +21,7 @@ $(OBJS): %.o: %.c $(HEADERS) $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ install: all - install $(PROG) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) $(PROG) $(PREFIX)/bin ++ $(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(PREFIX)/bin clean: rm -f $(PROG) $(OBJS) -- cgit