d2a04c4887
Bump PORTREVISION due to changed file locations. PR: ports/82200, see also ports/82197 Submitted by: Jonathan Noack <noackjr@alumni.rice.edu> Approved by: david@pinko.net (maintainer, timeout 4 months)
28 lines
1 KiB
Text
28 lines
1 KiB
Text
--- Makefile.orig Fri Dec 10 19:50:39 2004
|
|
+++ Makefile Mon Jun 13 08:29:12 2005
|
|
@@ -28,9 +28,9 @@
|
|
OSFLAG = `uname | tr '[:lower:]' '[:upper:]'`
|
|
SHELL=/bin/sh
|
|
|
|
-GKRELL1FLAG=1
|
|
+GKRELL1FLAG=0
|
|
#find out if we have gkrellm 2 or 1 (from the gtk+ version)
|
|
-GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
|
|
+#GKRELL1FLAG=$(shell sh -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
|
|
GKRELLTOP= gkrelltop.so
|
|
OBJ = top_three.o gkrelltop.o
|
|
EXTRA = krell_panel1.xpm
|
|
@@ -61,11 +61,11 @@
|
|
endif
|
|
|
|
ifeq ($(WANT_GLIB12),yes)
|
|
-CFLAGSD = -I/usr/X11R6/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags`
|
|
+CFLAGSD = -I${PREFIX}/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags`
|
|
LIBSD = `glib-config --libs`
|
|
CONFIGURE_ARGS += --with-glib12
|
|
else
|
|
-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags`
|
|
+CFLAGSD = -D$(OSFLAG) -I${PREFIX}/include -fPIC -Wall `pkg-config glib-2.0 --cflags`
|
|
LIBSD = `pkg-config glib-2.0 --libs`
|
|
endif
|
|
INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
|