$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 13:35:09 agc Exp $
--- Makefile.orig	Wed Mar 28 10:09:18 2001
+++ 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${X11PREFIX}/lib -L${X11PREFIX}/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${X11PREFIX}/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)
+	install -s -c $(APP) ${X11PREFIX}/bin
 
 clean::
 	for i in $(OBJS) ; do \