summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2000-11-02 06:11:12 +0000
committerMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2000-11-02 06:11:12 +0000
commit10b636ca5a36d328250b85ac4128c25b49e456fd (patch)
treea119a6fb42ea20c7446a4f00fcc49e6417343901 /cad
parentUpgrade to 2.6 (without distname change). (diff)
Uphold ${MOTIFLIB}
Submitted by: bento
Notes
Notes: svn path=/head/; revision=34619
Diffstat (limited to 'cad')
-rw-r--r--cad/electric/files/patch-aa28
1 files changed, 17 insertions, 11 deletions
diff --git a/cad/electric/files/patch-aa b/cad/electric/files/patch-aa
index c5f5c6b17b73..73428b5da7a5 100644
--- a/cad/electric/files/patch-aa
+++ b/cad/electric/files/patch-aa
@@ -1,9 +1,14 @@
-This patch teaches it to respect our CFLAGS, the install
-program and where to find the X11 header files. Besides,
-it tells it a little bit about hier(7)
-
---- Makefile.in.orig Tue Mar 21 19:44:46 2000
-+++ Makefile.in Thu May 4 02:16:35 2000
+--- Makefile.in.orig Tue Mar 21 19:44:24 2000
++++ Makefile.in Wed Nov 1 03:49:14 2000
+@@ -14,7 +14,7 @@
+ ############################################### X WIDGET SELECTION ############
+ ##### If using Motif/Lesstif widgets, uncomment the next two lines
+ TIFFLAGS = -DUSETIF
+-XTLIBS = -lXm @XMULIB@ -lXt
++XTLIBS = ${MOTIFLIB} @XMULIB@ -lXt
+
+ ##### If using Athena widgets, uncomment the next line
+ # XTLIBS = -lXaw @XMULIB@ -lXt
@@ -356,18 +356,19 @@
BUILDOPTS = $(DEBUG)
BUILDDIR = obj
@@ -38,15 +43,16 @@ it tells it a little bit about hier(7)
$(INSTALL_PROGRAM) electric @bindir@/electric
- $(INSTALL_DATA) lib/* $(prefix)/electric/lib
- $(INSTALL_DATA) lib/.cadrc $(prefix)/electric/lib
-+ $(INSTALL_DATA) lib/*.help @datadir@/electric/lib
-+ $(INSTALL_DATA) lib/*.mac @datadir@/electric/lib
-+ $(INSTALL_DATA) lib/*.txt @datadir@/electric/lib
-+ $(INSTALL_DATA) lib/.cadrc @datadir@/electric/lib
-
+-
-$(prefix)/electric:
- mkdir $(prefix)/electric
-$(prefix)/electric/lib:
- mkdir $(prefix)/electric/lib
++ $(INSTALL_DATA) lib/*.help @datadir@/electric/lib
++ $(INSTALL_DATA) lib/*.mac @datadir@/electric/lib
++ $(INSTALL_DATA) lib/*.txt @datadir@/electric/lib
++ $(INSTALL_DATA) lib/.cadrc @datadir@/electric/lib
++
+@datadir@/electric:
+ $(INSTALL_DIR) @datadir@/electric
+@datadir@/electric/lib: