[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / graphics / wmphoto / patches
File: [cvs.NetBSD.org] / pkgsrc / graphics / wmphoto / patches / patch-aa (download)

Revision 1.4, Sat Jul 4 16:18:36 2015 UTC (8 years, 3 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, HEAD
Changes since 1.3: +4 -4 lines 

Remove USE_X11BASE and X11PREFIX.

$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:36 joerg Exp $

--- wmphoto/Makefile.orig	Wed Mar 28 10:09:18 2001
+++ wmphoto/Makefile	Wed Mar 28 10:15:59 2001
@@ -1,19 +1,8 @@
 # wmphoto Makefile
 
-# directory where to install it.
-INSTALL = /usr/local/bin
-
-# RedHat Linux 5.2
-CC = gcc
-CCOPTIONS = -O2 -Wall
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
 LIBS   = -lXpm -lXext -lX11
-
-# Slowlaris at my university
-#CC = gcc
-#CCOPTIONS = -O2 -I/usr/local/X11R6/include
-#LIBDIR = -L/usr/local/X11R6/lib
-#LIBS   = -lXpm -lXext -lX11 -lsocket -lnsl
+CFLAGS = -I${PREFIX}/include -I${X11BASE}/include
 
 # now the common stuff...
 APP = wmphoto
@@ -25,16 +14,13 @@
 all: $(APP)
 
 .c.o:
-	$(CC) -c $(CCOPTIONS) $< -o $*.o
+	${CC} -c ${CFLAGS} $< -o $*.o
 
 $(APP): $(OBJS)
-	$(CC) -o $(APP) $^ $(LIBDIR) $(LIBS)
+	${CC} -o $(APP) $^ $(LIBDIR) $(LIBS)
 
 install: $(APP)
-	strip $(APP)
-	cp $(APP) $(INSTALL)
-	chown root.root $(APP)
-	chmod 755 $(APP)
+	${BSD_INSTALL_PROGRAM} $(APP) ${DESTDIR}${PREFIX}/bin
 
 clean::
 	for i in $(OBJS) ; do \