diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /ftp/wmget | |
parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) |
Notes
Diffstat (limited to 'ftp/wmget')
-rw-r--r-- | ftp/wmget/files/patch-Makefile | 6 | ||||
-rw-r--r-- | ftp/wmget/files/patch-dockapp::Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ftp/wmget/files/patch-Makefile b/ftp/wmget/files/patch-Makefile index d74766457f62..018defc4014f 100644 --- a/ftp/wmget/files/patch-Makefile +++ b/ftp/wmget/files/patch-Makefile @@ -5,7 +5,7 @@ # make PREFIX=/opt/dockapps install -PREFIX= /usr/local +X11BASE?= /usr/X11R6 -+PREFIX?= ${X11BASE} ++PREFIX?= ${LOCALBASE} INSTALLDIR= install -d -m 755 -INSTALLBIN= install -m 555 @@ -16,11 +16,11 @@ +INSTALLMAN= $(INSTALL_MAN) +CC?= gcc +CFLAGS?= -Wall -W -+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include ++CFLAGS+= -I${LOCALBASE}/include # The following line is what I use during development #CFLAGS:= $(CFLAGS) -Werror -g -LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl -+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl ++LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl DOCS= wmget.1 VERSION:= $(shell grep '\#define WMGET_VERSION ' wmget.h \ diff --git a/ftp/wmget/files/patch-dockapp::Makefile b/ftp/wmget/files/patch-dockapp::Makefile index e047a61e533b..bc8795eebb07 100644 --- a/ftp/wmget/files/patch-dockapp::Makefile +++ b/ftp/wmget/files/patch-dockapp::Makefile @@ -10,8 +10,8 @@ -CFLAGS= -ansi -Wall -W -Werror -g -LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 +CFLAGS?= -ansi -Wall -W -Werror -g -+CFLAGS+= -I${X11BASE}/include -+LDFLAGS= -L${X11BASE}/lib -lXpm -lXext -lX11 ++CFLAGS+= -I${LOCALBASE}/include ++LDFLAGS= -L${LOCALBASE}/lib -lXpm -lXext -lX11 dockapp.a: $(DAOBJS) ar rcsv dockapp.a $(DAOBJS) |