diff options
Diffstat (limited to 'comms/malsync/patches/patch-aa')
-rw-r--r-- | comms/malsync/patches/patch-aa | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/comms/malsync/patches/patch-aa b/comms/malsync/patches/patch-aa index 281ec8b4f6c..bf65e400f17 100644 --- a/comms/malsync/patches/patch-aa +++ b/comms/malsync/patches/patch-aa @@ -1,35 +1,30 @@ -$NetBSD: patch-aa,v 1.2 2001/06/27 18:07:55 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2003/01/13 18:29:52 wiz Exp $ ---- Makefile.orig Sun May 14 17:17:35 2000 +--- Makefile.orig Sun Nov 17 19:52:53 2002 +++ Makefile -@@ -1,4 +1,3 @@ --CC = gcc +@@ -1,5 +1,7 @@ TARGET = malsync ++all: ${TARGET} ++ PLAT := $(shell uname) -@@ -12,9 +11,9 @@ + + ifeq ($(PLAT),SunOS) +@@ -15,7 +17,6 @@ LINKLIBS = -lm endif - TREETOP = ../../.. --PILOT_LINK_DIR = $(TREETOP)/vendor/pilot/pilot-link.0.9.3 -+PILOT_LINK_DIR = ${BUILDLINK_DIR} - --CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \ -+CFLAGS+=-DMALSYNC -D__unix__ -I$(TREETOP)/mal/common \ - -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include -I. - - -@@ -55,10 +54,12 @@ + TREETOP = . +-PILOT_LINK_DIR = $(TREETOP)/pilot-link-0.11.5 - OBJS = $(SRC:.c=.o) - -+all: ${TARGET} -+ + CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \ + -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include \ +@@ -72,8 +73,8 @@ DYNLINK = -rdynamic + endif $(TARGET): $(OBJS) -- $(CC) -rdynamic $(CFLAGS) -o $@ $(OBJS) \ -- -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS) -+ $(CC) -rdynamic $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) \ +- $(CC) $(DYNLINK) $(CFLAGS) -o $@ $(OBJS) \ +- -L${PILOT_LINK_DIR}/libpisock/.libs -lpisock $(LINKLIBS) ++ $(CC) $(DYNLINK) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) \ + -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS) clean: rm -f $(OBJS) $(TARGET) |