Attempt to fix FTBFS in tdevelop (again)

pull/3/head
Timothy Pearson 10 years ago
parent 5839b0d399
commit d9733bddae

@ -1,4 +1,3 @@
debian/tmp/opt/trinity/lib/trinity/libkdevdesignerpart.*
debian/tmp/opt/trinity/lib/libkinterfacedesigner.*
debian/tmp/opt/trinity/bin/kdevdesigner
debian/tmp/opt/trinity/share/services/kdevdesigner_part.desktop

@ -1,5 +1,14 @@
#!/usr/bin/make -f
# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
# Also include the main Trinity path
ifeq ("$(LD_LIBRARY_PATH)", "")
LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
else
LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
endif
export LD_LIBRARY_PATH
# work around debian/cdbs/uploaders.mk
makebuilddir::
[ -f debian/control.tmp ] || cp debian/control debian/control.tmp
@ -79,5 +88,4 @@ binary-install/tdevelop-trinity::
cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps
mv debian/tdevelop-trinity/usr/share/man debian/tdevelop-trinity/opt/trinity/share/
rm debian/tdevelop-trinity/opt/trinity/lib/trinity/libkdevdesignerpart.*
rm debian/tdevelop-trinity/opt/trinity/lib/libkinterfacedesigner.*
rm debian/tdevelop-trinity/opt/trinity/share/services/kdevdesigner_part.desktop

@ -1,4 +1,3 @@
debian/tmp/opt/trinity/lib/trinity/libkdevdesignerpart.*
debian/tmp/opt/trinity/lib/libkinterfacedesigner.*
debian/tmp/opt/trinity/bin/kdevdesigner
debian/tmp/opt/trinity/share/services/kdevdesigner_part.desktop

@ -1,5 +1,14 @@
#!/usr/bin/make -f
# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
# Also include the main Trinity path
ifeq ("$(LD_LIBRARY_PATH)", "")
LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
else
LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
endif
export LD_LIBRARY_PATH
# work around debian/cdbs/uploaders.mk
makebuilddir::
[ -f debian/control.tmp ] || cp debian/control debian/control.tmp
@ -79,5 +88,4 @@ binary-install/tdevelop-trinity::
cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps
mv debian/tdevelop-trinity/usr/share/man debian/tdevelop-trinity/opt/trinity/share/
rm debian/tdevelop-trinity/opt/trinity/lib/trinity/libkdevdesignerpart.*
rm debian/tdevelop-trinity/opt/trinity/lib/libkinterfacedesigner.*
rm debian/tdevelop-trinity/opt/trinity/share/services/kdevdesigner_part.desktop

@ -1,4 +1,3 @@
debian/tmp/opt/trinity/lib/trinity/libkdevdesignerpart.*
debian/tmp/opt/trinity/lib/libkinterfacedesigner.*
debian/tmp/opt/trinity/bin/kdevdesigner
debian/tmp/opt/trinity/share/services/kdevdesigner_part.desktop

@ -1,5 +1,14 @@
#!/usr/bin/make -f
# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
# Also include the main Trinity path
ifeq ("$(LD_LIBRARY_PATH)", "")
LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
else
LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
endif
export LD_LIBRARY_PATH
# work around debian/cdbs/uploaders.mk
makebuilddir::
[ -f debian/control.tmp ] || cp debian/control debian/control.tmp
@ -79,5 +88,4 @@ binary-install/tdevelop-trinity::
cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps
mv debian/tdevelop-trinity/usr/share/man debian/tdevelop-trinity/opt/trinity/share/
rm debian/tdevelop-trinity/opt/trinity/lib/trinity/libkdevdesignerpart.*
rm debian/tdevelop-trinity/opt/trinity/lib/libkinterfacedesigner.*
rm debian/tdevelop-trinity/opt/trinity/share/services/kdevdesigner_part.desktop

Loading…
Cancel
Save