tags 641941 patch
thanks
On 2011-09-19 16:02:47 +0200, Vincent Lefevre wrote:
> In debian/rules, one has:
>
> override_dh_auto_build: build/stamp $(objects)
> SYSTEM_XPDFRC=/etc/xpdf/xpdfrc $(CXX) $(LDFLAGS) -o build/xpdf.real
> build/*.o $(libraries)
>
> but defining an environment variable there for linking has no effect.
> One needs -DSYSTEM_XPDFRC=/etc/xpdf/xpdfrc at the right time: when
> building the .o files (not at link time). Alternatively, I suppose
> that a
>
> #define SYSTEM_XPDFRC "/etc/xpdf/xpdfrc"
>
> could be added to build/config.h before the "#ifdef SYSTEM_XPDFRC"
> (I don't know how these things work under Debian).
I've attached a patch, choosing another simpler solution. The idea
is to replace
#define xpdfSysConfigFile "xpdfrc"
by
#define xpdfSysConfigFile "/etc/xpdf/xpdfrc"
in the case where SYSTEM_XPDFRC is not defined (which is the case
here, without a configure step).
--
Vincent Lefèvre <vinc...@vinc17.net> - Web: <http://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <http://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / Arénaire project (LIP, ENS-Lyon)
--- debian/rules.old 2011-09-17 09:57:31.000000000 +0200
+++ debian/rules 2011-09-19 16:08:58.000000000 +0200
@@ -26,11 +26,12 @@
sed -e s/GString/GooString/g -e s/GMutex/GooMutex/g -e
s/GHash/GooHash/g \
-e s/GList/GooList/g -e s/\<aconf\.h\>/\<poppler-config\.h\>/g \
-e s/errConfig,//g -e s/errSyntaxError,//g -e s/errIO,//g -i build/*
+ sed -e 's/xpdfSysConfigFile "xpdfrc"/xpdfSysConfigFile
"\/etc\/xpdf\/xpdfrc"/' -i build/config.h
mv build/parseargs.c build/parseargs.cc
touch $@
override_dh_auto_build: build/stamp $(objects)
- SYSTEM_XPDFRC=/etc/xpdf/xpdfrc $(CXX) $(LDFLAGS) -o build/xpdf.real
build/*.o $(libraries)
+ $(CXX) $(LDFLAGS) -o build/xpdf.real build/*.o $(libraries)
%:
dh ${@}
