tags 363574 +patch
thanks

Hello,

the attached patch changes debian/rules to install files in /usr/lib and
/usr/include/X11 instead of /usr/X11R6/lib and /usr/X11R6/include/X11.

Regards
Andreas Jochens

diff -urN ../tmp-orig/libforms1-1.0/debian/rules ./debian/rules
--- ../tmp-orig/libforms1-1.0/debian/rules      2006-04-21 12:45:52.000000000 
+0000
+++ ./debian/rules      2006-04-21 12:42:45.000000000 +0000
@@ -32,11 +32,11 @@
        dh_testroot
        dh_clean -k
 #      make install DESTDIR=`pwd`/debian/tmp   
-       dh_installdirs usr/X11R6/lib
-       install lib/libforms.so.1.0 debian/tmp/usr/X11R6/lib
-       ln -s libforms.so.1.0 debian/tmp/usr/X11R6/lib/libforms.so.1
-       install image/libflimage.so.1.0 debian/tmp/usr/X11R6/lib
-       ln -s libflimage.so.1.0 debian/tmp/usr/X11R6/lib/libflimage.so.1
+       dh_installdirs usr/lib
+       install lib/libforms.so.1.0 debian/tmp/usr/lib
+       ln -s libforms.so.1.0 debian/tmp/usr/lib/libforms.so.1
+       install image/libflimage.so.1.0 debian/tmp/usr/lib
+       ln -s libflimage.so.1.0 debian/tmp/usr/lib/libflimage.so.1
        dh_installdocs 00README
        dh_installchangelogs Changes
        dh_strip 
@@ -56,9 +56,9 @@
        dh_testroot -plibformsgl1
        dh_clean -k -plibformsgl1
 #      make install DESTDIR=`pwd`/debian/tmp   
-       dh_installdirs -plibformsgl1 usr/X11R6/lib
-       install gl/libformsGL.so.1.0 debian/libformsgl1/usr/X11R6/lib
-       ln -s libformsGL.so.1.0 debian/libformsgl1/usr/X11R6/lib/libformsGL.so.1
+       dh_installdirs -plibformsgl1 usr/lib
+       install gl/libformsGL.so.1.0 debian/libformsgl1/usr/lib
+       ln -s libformsGL.so.1.0 debian/libformsgl1/usr/lib/libformsGL.so.1
        dh_installdocs -plibformsgl1 00README
        dh_installchangelogs -plibformsgl1 Changes
        dh_strip -plibformsgl1
@@ -77,13 +77,13 @@
        dh_testdir -plibforms-dev
        dh_testroot -plibforms-dev
        dh_clean -k -plibforms-dev
-       dh_installdirs -plibforms-dev usr/X11R6/lib usr/X11R6/include/X11
-       install lib/libforms.a debian/libforms-dev/usr/X11R6/lib
-       ln -s libforms.so.1.0 debian/libforms-dev/usr/X11R6/lib/libforms.so
-       install image/libflimage.a debian/libforms-dev/usr/X11R6/lib/
-       ln -s libflimage.so.1.0 debian/libforms-dev/usr/X11R6/lib/libflimage.so
-       install -m 604 lib/forms.h debian/libforms-dev/usr/X11R6/include/X11
-       install -m 604 image/flimage.h debian/libforms-dev/usr/X11R6/include/X11
+       dh_installdirs -plibforms-dev usr/lib usr/include/X11
+       install lib/libforms.a debian/libforms-dev/usr/lib
+       ln -s libforms.so.1.0 debian/libforms-dev/usr/lib/libforms.so
+       install image/libflimage.a debian/libforms-dev/usr/lib/
+       ln -s libflimage.so.1.0 debian/libforms-dev/usr/lib/libflimage.so
+       install -m 604 lib/forms.h debian/libforms-dev/usr/include/X11
+       install -m 604 image/flimage.h debian/libforms-dev/usr/include/X11
        dh_installdocs -plibforms-dev
        dh_installchangelogs -plibforms-dev
        dh_strip -plibforms-dev
@@ -99,10 +99,10 @@
        dh_testdir -plibformsgl-dev
        dh_testroot -plibformsgl-dev
        dh_clean -k -plibformsgl-dev
-       dh_installdirs -plibformsgl-dev usr/X11R6/lib usr/X11R6/include/X11
-       install gl/libformsGL.a debian/libformsgl-dev/usr/X11R6/lib
-       ln -s libformsGL.so.1.0 
debian/libformsgl-dev/usr/X11R6/lib/libformsGL.so
-       install -m 604 gl/glcanvas.h debian/libformsgl-dev/usr/X11R6/include/X11
+       dh_installdirs -plibformsgl-dev usr/lib usr/include/X11
+       install gl/libformsGL.a debian/libformsgl-dev/usr/lib
+       ln -s libformsGL.so.1.0 debian/libformsgl-dev/usr/lib/libformsGL.so
+       install -m 604 gl/glcanvas.h debian/libformsgl-dev/usr/include/X11
        dh_installdocs -plibformsgl-dev
        dh_installchangelogs -plibformsgl-dev
        dh_strip -plibformsgl-dev


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to