pkgsrc/sysutils/toshutils/patches/patch-ad
wiz dd280983d5 add missing -Wl,-R for hotkey (noted in hubertf's latest bulk build)
XXX: /usr/X11R6 was and is hard-wired -- someone should fix this. :)
2000-09-02 19:24:34 +00:00

64 lines
1.9 KiB
Text

$NetBSD: patch-ad,v 1.2 2000/09/02 19:24:34 wiz Exp $
--- src/Makefile.in.orig Fri Dec 17 14:07:03 1999
+++ src/Makefile.in
@@ -62,8 +62,8 @@
#
# 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@
@@ -88,37 +88,37 @@
$(CC) -m486 -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)