f621f34c1b
* configure require libXt to check X11, as PR 42085 * Set LICENSE=gnu-gpl-v2 * add DESTDIR support. * need lex and yacc * marked as MAKE_JOBS_SAFE=no * set SETUID_ROOT_PERMS to executables.
73 lines
2.1 KiB
Text
73 lines
2.1 KiB
Text
$NetBSD: patch-ad,v 1.3 2009/09/18 09:37:01 obache Exp $
|
|
|
|
--- 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@
|
|
@@ -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@
|
|
@@ -88,37 +88,37 @@ sci.o: sci.c
|
|
$(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)
|