blob: 49316f6f2788e08b2f0f623d8e7f5ab9f33546b1 (
plain) (
blame)
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
|
--- Makefile.in.orig Fri Nov 7 05:44:51 2003
+++ Makefile.in Fri Nov 14 00:00:39 2003
@@ -168,7 +168,7 @@
tmpdir = /tmp
# Directory for app-defaults file
-appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
+appdefaultsdir = $(libdir)/X11/app-defaults
PATHNAMES = -DPROG_VERSION=$(VERSION) \
-DCAD_DIR=\"$(prefix)\" \
@@ -195,7 +195,7 @@
INCLUDES = -IXw ${INC_SPECS}
# Library directory and files
-librarydir = $(datadir)/$(PACKAGE)-$(VERSION)
+librarydir = $(libdir)/X11/$(PACKAGE)
USER_RC_FILE = .xcircuitrc
PROLOGUE_FILE = xcircps2.pro
BUILTINS_DEP1 = generic.lps
@@ -746,7 +746,7 @@
lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
$(RM) lib/xcircuit${SHDLIB_EXT}
- $(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
+ $(LD) ${LDFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
tcl: lib/tcl/xcircuit${SHDLIB_EXT}
|
