r24: Initial Import

[debhelper.git] / dh_installdebfiles

diff --git a/dh_installdebfiles b/dh_installdebfiles
index 37c630890c2babd85a5adbcfed4e51ba5a72316a..a9954963fac0970f43f87f0140ac6147dfb1f1d1 100755 (executable)
--- a/dh_installdebfiles
+++ b/dh_installdebfiles
@@ -4,14 +4,14 @@
 # Also generates the control file.
 
 PATH=debian:$PATH:/usr/lib/debhelper
-source dh_lib
+. dh_lib
 
 for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
        EXT=`pkgext $PACKAGE`
 
-       if [ ! -d debian/$TMP/DEBIAN ]; then
-               doit "install -o root -g root -d debian/$TMP/DEBIAN"
+       if [ ! -d $TMP/DEBIAN ]; then
+               doit "install -o root -g root -d $TMP/DEBIAN"
        fi
 
        # Install debian install scripts.
@@ -20,23 +20,20 @@ for PACKAGE in $DH_DOPACKAGES; do
                if [ -f debian/$EXT$file ]; then
                        # Add this into the script, where it has #DEBHELPER#
                        if [ -f debian/$EXT$file.debhelper ]; then
-                               verbose_echo "perl -pe \"s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg\" < debian/$EXT$file > debian/$TMP/DEBIAN/$EXT$file"
-                               perl -pe "s~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg" < debian/$EXT$file > debian/$TMP/DEBIAN/$EXT$file
-                               doit "chown root.root debian/$TMP/DEBIAN/$EXT$file"
-                               doit "chmod 755 debian/$TMP/DEBIAN/$EXT$file"
+                               doit "perl -pe 's~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg' < debian/$EXT$file > $TMP/DEBIAN/$file"
+                               doit "chown root.root $TMP/DEBIAN/$file"
+                               doit "chmod 755 $TMP/DEBIAN/$file"
                        else
-                               doit "install -o root -g root -p debian/$EXT$file debian/$TMP/DEBIAN/"
+                               doit "install -o root -g root -p debian/$EXT$file $TMP/DEBIAN/$file"
                        fi
                else
                        # Auto-generate script header and add .debhelper
                        # content to it.
                        if [ -f debian/$EXT$file.debhelper ]; then
-                               verbose_echo "echo '#!/bin/sh -e' > debian/$TMP/DEBIAN/$EXT$file"
-                               echo '#!/bin/sh -e' > debian/$TMP/DEBIAN/$EXT$file
-                               verbose_echo "cat debian/$EXT$file.debhelper >> debian/$TMP/DEBIAN/$EXT$file"
-                               cat debian/$EXT$file.debhelper >> debian/$TMP/DEBIAN/$EXT$file
-                               doit "chown root.root debian/$TMP/DEBIAN/$EXT$file"
-                               doit "chmod 755 debian/$TMP/DEBIAN/$EXT$file"
+                               doit "echo '#!/bin/sh -e' > $TMP/DEBIAN/$file"
+                               doit "cat debian/$EXT$file.debhelper >> $TMP/DEBIAN/$file"
+                               doit "chown root.root $TMP/DEBIAN/$file"
+                               doit "chmod 755 $TMP/DEBIAN/$file"
                        fi
                fi
        done
@@ -44,13 +41,13 @@ for PACKAGE in $DH_DOPACKAGES; do
        # Install non-executable files
        for file in shlibs conffiles; do
                if [ -f debian/$EXT$file ]; then
-                       doit "install -o root -g root -m 644 -p debian/$EXT$file debian/$TMP/DEBIAN"
+                       doit "install -o root -g root -m 644 -p debian/$EXT$file $TMP/DEBIAN/$file"
                fi                                               
        done
 
        # Run dpkg-shlibdeps to generate dependancies.
        filelist=""
-       for file in `find debian/$TMP -type f \( -perm +111 -or -name "*.so*" \) | tr "\n" " "` ; do
+       for file in `find $TMP -type f \( -perm +111 -or -name "*.so*" \) | tr "\n" " "` ; do
                case "`file $file`" in
                        *ELF*)
                                filelist="$file $filelist"
@@ -62,6 +59,6 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        # Generate and install control file.
-       doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -Pdebian/$TMP"
-       doit "chown root.root debian/$TMP/DEBIAN/control"
+       doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP"
+       doit "chown root.root $TMP/DEBIAN/control"
 done