cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build after movement of pilot-link's library.

Browse Source 
PR:		ports/34191
Submitted by:	Steve Wills <steve@stevenwills.com>
This commit is contained in:
Dirk Froemberg 2002-02-14 22:00:05 +00:00
parent 87ca257abb
commit f3e4528617
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=54713
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
palm/malsync/files/patch-aa
View File

@ -1,11 +1,11 @@
--- Makefile.orig Sun May 14 23:17:35 2000
+++ Makefile Tue Jul 25 14:25:02 2000
--- Makefile.orig Sun May 14 21:17:35 2000
+++ Makefile Mon Feb 11 19:30:47 2002
@@ -1,4 +1,3 @@
-CC = gcc
TARGET = malsync
PLAT := $(shell uname)
@@ -12,9 +11,15 @@
@@ -12,10 +11,16 @@
endif
TREETOP = ../../..
@ -15,14 +15,16 @@
+DEFINES = -DMALSYNC
-CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
- -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include -I.
+ifeq ($(PLAT),FreeBSD)
+LINKFLAGS = -Wl,--rpath -Wl,$(PILOT_LINK_DIR)/lib
+LINKFLAGS = -Wl,--rpath -Wl,$(PREFIX)/lib
+endif
+
+CFLAGS += $(DEFINES) -I$(TREETOP)/mal/common \
-I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include -I.
+ -I$(TREETOP)/mal/client/common -I$(PREFIX)/include -I.
SRC = malsync.c MAL31ServerConfig.c MAL31DBConfig.c MAL31UserConfig.c \
@@ -55,17 +60,12 @@
OBJS = $(SRC:.c=.o)
@ -33,7 +35,7 @@
- $(CC) -rdynamic $(CFLAGS) -o $@ $(OBJS) \
- -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) \
+ -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS) $(LINKFLAGS)
+ -L${PREFIX}/lib -lpisock $(LINKLIBS) $(LINKFLAGS)
+
clean:
rm -f $(OBJS) $(TARGET)
@ -44,4 +46,3 @@
-
-
-