summaryrefslogtreecommitdiff
path: root/time/ical/patches/patch-aa
blob: 4205be04fc09e837f2215a8ddad904ad27136b8c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
$NetBSD: patch-aa,v 1.3 2009/07/07 20:12:01 joerg Exp $

--- Makefile.in.orig	2004-03-11 12:26:55.000000000 +0100
+++ Makefile.in
@@ -76,13 +76,13 @@ OBJS = cal_tcl.o dateeditor.o dispatch.o
 all: $(CONFIGURED) ical
 
 ical: $(LIB3) $(LIB2) $(LIB1) $(OBJS) main.o
-	$(CXXLINKER) -o $@ $(OBJS) main.o $(LIBS)
+	$(CXXLINKER) -o $@ $(OBJS) main.o -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib $(LIBS)
 
 ical-bundle: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o
-	$(CXXLINKER) -o $@ $(OBJS) mbundle.o $(BLIBS)
+	$(CXXLINKER) -o $@ $(OBJS) mbundle.o -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib $(BLIBS)
 
 ical-tiny: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o
-	$(CXXLINKER) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS)
+	$(CXXLINKER) -o $@ $(OBJS) mbundle.o -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib $(TINY_BLIBS)
 
 $(LIB1): FRC
 	@echo making in calendar
@@ -153,39 +153,39 @@ install: instbin instman instlib instcon
 	@echo installation finished
 
 instbin: ical
-	-$(MKDIR) $(BINDIR)
-	$(INSTALL) ical $(BINDIR)/ical-@ICAL_VERSION@
-	$(RM) -f $(BINDIR)/ical
-	$(LN_S) ical-@ICAL_VERSION@ $(BINDIR)/ical
+	-$(MKDIR) ${DESTDIR}$(BINDIR)
+	$(INSTALL) ical ${DESTDIR}$(BINDIR)/ical-@ICAL_VERSION@
+	$(RM) -f ${DESTDIR}$(BINDIR)/ical
+	$(LN_S) ical-@ICAL_VERSION@ ${DESTDIR}$(BINDIR)/ical
 
 instman:
-	-$(MKDIR) $(MANDIR)
-	-$(MKDIR) $(MANDIR)/man1
-	-$(INSTALL_DATA) $(srcdir)/doc/ical.man $(MANDIR)/man1/ical.1
+	-$(MKDIR) ${DESTDIR}$(MANDIR)
+	-$(MKDIR) ${DESTDIR}$(MANDIR)/man1
+	-$(INSTALL_DATA) $(srcdir)/doc/ical.man ${DESTDIR}$(MANDIR)/man1/ical.1
 
 instlib:
-	-$(MKDIR) $(LIBDIR)
-	-$(MKDIR) $(LIBDIR)/ical
-	-$(MKDIR) $(ILIBDIR)
-	-$(MKDIR) $(ILIBDIR)/tcllib
+	-$(MKDIR) ${DESTDIR}$(LIBDIR)
+	-$(MKDIR) ${DESTDIR}$(LIBDIR)/ical
+	-$(MKDIR) ${DESTDIR}$(ILIBDIR)
+	-$(MKDIR) ${DESTDIR}$(ILIBDIR)/tcllib
 	@for f in $(LIB_FILES) $(srcdir)/tcllib/tclIndex ; do\
-		echo $(INSTALL_DATA) $$f $(ILIBDIR)/tcllib/`basename $$f`;\
-		$(INSTALL_DATA) $$f $(ILIBDIR)/tcllib/`basename $$f`;\
+		echo $(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/tcllib/`basename $$f`;\
+		$(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/tcllib/`basename $$f`;\
 	done
 	@for f in $(ICAL_FILES) $(srcdir)/tclIndex ; do\
-		echo $(INSTALL_DATA) $$f $(ILIBDIR)/`basename $$f`;\
-		$(INSTALL_DATA) $$f $(ILIBDIR)/`basename $$f`;\
+		echo $(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/`basename $$f`;\
+		$(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/`basename $$f`;\
 	done
 
 instcontrib:
-	-$(MKDIR) $(LIBDIR)
-	-$(MKDIR) $(LIBDIR)/ical
-	-$(MKDIR) $(ILIBDIR)
-	-$(MKDIR) $(ILIBDIR)/contrib
+	-$(MKDIR) ${DESTDIR}$(LIBDIR)
+	-$(MKDIR) ${DESTDIR}$(LIBDIR)/ical
+	-$(MKDIR) ${DESTDIR}$(ILIBDIR)
+	-$(MKDIR) ${DESTDIR}$(ILIBDIR)/contrib
 	@for f in $(srcdir)/contrib/* ; do\
 		if test -f $$f ; then\
-		echo $(INSTALL_DATA) $$f $(ILIBDIR)/contrib/`basename $$f`;\
-		$(INSTALL_DATA) $$f $(ILIBDIR)/contrib/`basename $$f`;\
+		echo $(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/contrib/`basename $$f`;\
+		$(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/contrib/`basename $$f`;\
 		fi;\
 	done