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
|
$NetBSD: patch-ac,v 1.3 2006/11/12 14:25:50 dmcmahill Exp $
--- Makefile.in.orig 2006-06-14 09:15:38.000000000 +0100
+++ Makefile.in 2006-09-01 01:55:36.000000000 +0100
@@ -102,7 +102,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SHLIB_CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -123,7 +123,7 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTALL_TARGET = @INSTALL_TARGET@
-INTERP_PATH = @INTERP_PATH@
+INTERP_PATH = tcl
LD = @LD@
LDDL_FLAGS = @LDDL_FLAGS@
LDFLAGS = @LDFLAGS@
@@ -155,7 +155,7 @@
SHLIB_LD = @SHLIB_LD@
SHLIB_LIB_SPECS = @SHLIB_LIB_SPECS@
SPICE_EXEC = @SPICE_EXEC@
-STARTUP_FILE = @STARTUP_FILE@
+STARTUP_FILE = ../startup.script
STDLIBS = @STDLIBS@
STRIP = @STRIP@
SUBDIRS = @SUBDIRS@
@@ -226,7 +226,7 @@
# Directories for app-defaults file and manual page
appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults
-appmandir = $(datadir)/$(PACKAGE)-$(VERSION)/man
+appmandir = $(mandir)
PATHNAMES = -DPROG_VERSION=$(VERSION) \
-DPROG_REVISION=$(REVISION) \
-DCAD_DIR=\"$(libdir)\" \
@@ -640,14 +640,14 @@
xcwrap.c -c -o xcwrap.o
lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND}
- $(RM) lib/xcircuit${SHDLIB_EXT}
+# $(RM) lib/xcircuit${SHDLIB_EXT}
$(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \
${xcircuit_OBJECTS} ${xcircuit_LDADD} ${LDFLAGS} \
${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} ${EXTRA_LIB_SPECS} \
${SHLIB_LIB_SPECS}
xcircexec$(EXEEXT): xcircexec.o
- $(RM) ./xcircexec$(EXEEXT)
+# $(RM) ./xcircexec$(EXEEXT)
$(CC) ${CFLAGS} ${CPPFLAGS} ${DEFS} $(PATHNAMES) $(INCLUDES) \
xcircexec.c -o xcircexec$(EXEEXT) ${LDFLAGS} \
${LIBS} ${LIB_SPECS} ${EXTRA_LIB_SPECS}
@@ -694,7 +694,7 @@
$(mkinstalldirs) $(DESTDIR)$(appdefaultsdir)
$(mkinstalldirs) $(DESTDIR)$(appmandir)
$(INSTALL_DATA) lib/XCircuit.ad $(DESTDIR)$(appdefaultsdir)/XCircuit
- $(INSTALL_DATA) lib/xcircuit.1 $(DESTDIR)$(appmandir)/xcircuit.1
+ $(INSTALL_DATA) lib/xcircuit.1 $(DESTDIR)$(appmandir)/man1/xcircuit.1
@echo "Installing library files"
$(mkinstalldirs) $(DESTDIR)$(librarydir)
( cd lib ; for i in $(PROLOGUE_FILE) *.lps; do \
|
