$NetBSD: patch-ad,v 1.4 2013/06/17 06:15:39 dholland Exp $

- destdir support
- drop -m486 as compilers don't recognize it any more
- add rpaths (shouldn't this use X11BASE and COMPILER_RPATH_FLAG?)
- add -li386 (shouldn't this be OS-dependent?)

--- src/Makefile.in.orig	1999-12-17 13:07:03.000000000 +0000
+++ src/Makefile.in
@@ -29,7 +29,7 @@ INSTALL = @INSTALL@
 BININSTALL = @INSTALL_PROGRAM@
 MANINSTALL = @INSTALL_DATA@
 prefix = @prefix@
-BINDESTDIR = @prefix@/bin
+BINDESTDIR = $(DESTDIR)@prefix@/bin
 MANDESTDIR = @mandir@
 YACC = @YACC@
 LEX = @LEX@
@@ -40,7 +40,7 @@ LDFLAGS = -s
 
 PROGRAMS = @PROGRAMS@
 CC = @CC@
-CFLAGS = -m486 -O2 -Wall -I../pixmaps @OS_CFLAGS@ @DEBUGFLAGS@ @GTK_CFLAGS@
+CFLAGS = -O2 -Wall -I../pixmaps @OS_CFLAGS@ @DEBUGFLAGS@ @GTK_CFLAGS@
 
 
 FANOBJS = fan.o sci.o hci.o
@@ -62,8 +62,8 @@ OBJS = sci.o hci.o fan.o svpw.o hotkey.o
 #
 # if your X11R6 libraries don't need X_LOCALE, remove -DX_LOCALE
 #
-XLIBS = -L/usr/X11R6/lib -lX11
-WMLIBS = -L/usr/X11R6/lib -lXpm -lX11 -lXext
+XLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
+WMLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lXpm -lX11 -lXext
 GTKLIBS = @GTK_LIBS@
 GTKFLAGS = @GTK_CFLAGS@
 XMESSAGE = @XMESSAGE@
@@ -82,43 +82,43 @@ lex.yy.c: parsetime.l
 	$(LEX) -i parsetime.l
 
 hci.o: hci.c
-	$(CC) -m486 -Wall -c hci.c
+	$(CC) -Wall -c hci.c
 
 sci.o: sci.c
-	$(CC) -m486 -Wall -c sci.c
+	$(CC) -Wall -c sci.c
 
 fan: $(FANOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(FANOBJS)
+	$(CC) $(LDFLAGS) -o $@ $(FANOBJS) -li386
 
 svpw: $(SVPWOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(SVPWOBJS)
+	$(CC) $(LDFLAGS) -o $@ $(SVPWOBJS) -li386
 
 hotkey: $(HOTOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS)
-	
+	$(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS) -li386
+
 dispswitch: $(DISPOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS)
+	$(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS) -li386
 
 tpasswd: $(PASSOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(PASSOBJS)
+	$(CC) $(LDFLAGS) -o $@ $(PASSOBJS) -li386
 
 alarm: $(ALARMOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(ALARMOBJS) $(LEXLIB)
+	$(CC) $(LDFLAGS) -o $@ $(ALARMOBJS) $(LEXLIB) -li386
 
 ownerstring: $(OWNEROBJS)
-	$(CC) $(LDFLAGS) -o $@ ($OWNEROBJS) $(READLIBS)
+	$(CC) $(LDFLAGS) -o $@ ($OWNEROBJS) $(READLIBS) -li386
 
 tdocked: $(DOCKOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(DOCKOBJS)
+	$(CC) $(LDFLAGS) -o $@ $(DOCKOBJS) -li386
 
 thotswap: $(SWAPOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(SWAPOBJS)
+	$(CC) $(LDFLAGS) -o $@ $(SWAPOBJS) -li386
 
 tuxtime-conf: $(TUXCONFOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(TUXCONFOBJS) $(GTKLIBS)
+	$(CC) $(LDFLAGS) -o $@ $(TUXCONFOBJS) $(GTKLIBS) -li386
 
 wmtuxtime: $(WMTUXOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(WMTUXOBJS) $(WMLIBS)
+	$(CC) $(LDFLAGS) -o $@ $(WMTUXOBJS) $(WMLIBS) -li386
 
 install: all
 	$(BININSTALL) -m 4755 $(PROGRAMS) $(BINDESTDIR)