diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2002-02-14 22:00:05 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2002-02-14 22:00:05 +0000 |
| commit | f3e45286174dd0a60eb0d49ed614266cafa40db3 (patch) | |
| tree | e2bbcebdd25674b78654886274abb97274bbbab0 /palm | |
| parent | Upgrade to 0.13.beta.j (diff) | |
Fix build after movement of pilot-link's library.
PR: ports/34191
Submitted by: Steve Wills <steve@stevenwills.com>
Notes
Notes:
svn path=/head/; revision=54713
Diffstat (limited to 'palm')
| -rw-r--r-- | palm/malsync/files/patch-aa | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/palm/malsync/files/patch-aa b/palm/malsync/files/patch-aa index 6b49d4dc49e2..227f35f109de 100644 --- a/palm/malsync/files/patch-aa +++ b/palm/malsync/files/patch-aa @@ -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 @@ - - - - |