55 lines
1.7 KiB
Text
55 lines
1.7 KiB
Text
--- Makefile.in.orig 2014-04-17 16:50:14.000000000 +0200
|
|
+++ Makefile.in 2014-04-21 15:13:31.000000000 +0200
|
|
@@ -358,7 +358,7 @@ top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
BINDIR = $(prefix)/bin
|
|
SHAREDIR = $(prefix)/share/xpaint
|
|
-XAPPLOADDIR = /etc/X11/app-defaults
|
|
+XAPPLOADDIR = /usr/local/lib/X11/app-defaults
|
|
PRINT_COMMAND = lpr
|
|
LPCCMD = /usr/sbin/lpc status
|
|
#define LPCCMD
|
|
@@ -1041,14 +1041,14 @@ docs: INSTALL README TODO ChangeLog
|
|
.PHONY:
|
|
|
|
version.h:
|
|
- rm -f xaw_incdir ; ln -s /usr/include/X11/Xaw3dxft xaw_incdir
|
|
+ rm -f xaw_incdir ; ln -s /usr/local/include/X11/Xaw3dxft xaw_incdir
|
|
echo "#define XPAINT_VERSION \"$(PACKAGE_VERSION)\"" > version.h
|
|
|
|
substads: substads.c
|
|
- $(CC) substads.c -o $@
|
|
+ $(CC) $(CFLAGS) substads.c -o $@
|
|
|
|
preproc: preproc.c version.h
|
|
- $(CC) preproc.c -o $@
|
|
+ $(CC) $(CFLAGS) preproc.c -o $@
|
|
|
|
DefaultRC.txt.h: substads DefaultRC
|
|
./substads -ad2c DefaultRC $@
|
|
@@ -1056,21 +1056,20 @@ DefaultRC.txt.h: substads DefaultRC
|
|
messages.h: preproc
|
|
./preproc > messages.h
|
|
|
|
-XPaint.ad: app-defaults
|
|
- $(CC) substads.c -o substads
|
|
- cd app-defaults ; \
|
|
+XPaint.ad: substads app-defaults
|
|
+ (cd app-defaults ; \
|
|
../substads -appdefs \
|
|
XPAINT_VERSION $(PACKAGE_VERSION) \
|
|
XPAINT_SHAREDIR $(SHAREDIR) \
|
|
XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
|
|
XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
|
|
- XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
|
|
+ XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)")
|
|
cp -p app-defaults/out/XPaint XPaint.ad
|
|
|
|
XPaint.ad.h: substads XPaint.ad
|
|
./substads -ad2c XPaint.ad $@
|
|
|
|
-xpaint.1: xpaint.1.in version.h
|
|
+xpaint.1: substads xpaint.1.in version.h
|
|
./substads -single xpaint.1.in xpaint.1 XPAINT_VERSION $(PACKAGE_VERSION)
|
|
|
|
install-exec-hook:
|