blob: eabcec782fc4d2ff16d130bd4c650da0496009ae (
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
30
31
32
33
|
--- Makefile.in.orig 2018-02-11 12:50:50 UTC
+++ Makefile.in
@@ -372,8 +372,8 @@ ac_aux_dir = dist
tmpdir = /tmp
# Directories for app-defaults file and manual page
-appdefaultsdir = $(libdir)/$(PACKAGE)-$(VERSION)/app-defaults
-appmandir = $(libdir)/$(PACKAGE)-$(VERSION)/man
+appdefaultsdir = $(libdir)/X11/app-defaults
+appmandir = $(man1dir)
PATHNAMES = -DPROG_VERSION=\"$(VERSION)\" \
-DPROG_REVISION=\"$(REVISION)\" \
-DCAD_DIR=\"$(libdir)\" \
@@ -409,8 +409,8 @@ man_MANS = lib/xcircuit.1
INCLUDES = -IXw ${INC_SPECS}
# Library directory and files
-librarydir = $(libdir)/$(PACKAGE)-$(VERSION)
-scriptsdir = $(libdir)/$(PACKAGE)-$(VERSION)
+librarydir = $(pkgdatadir)
+scriptsdir = $(pkgdatadir)
USER_RC_FILE = .xcircuitrc
PROLOGUE_FILE = xcircps2.pro
CYRILLIC_ENC_FILE = cyrillic.enc
@@ -842,7 +842,7 @@ lib/$(INTERP_PATH)/$(WRAPPER_OBJ): xcwrap.o ${xcircuit
$(RM) lib/$(INTERP_PATH)/$(WRAPPER_OBJ)
$(SHLIB_LD) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \
${xcircuit_OBJECTS} ${xcircuit_LDADD} ${SHLIB_LIB_SPECS} \
- ${LDFLAGS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} \
+ ${LDFLAGS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} ${LIBS} \
${LIB_SPECS} ${EXTRA_LIB_SPECS}
xcircexec$(EXEEXT): xcircexec.o
|
