summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-24 02:26:29 (UTC)
committer kergoth <kergoth>2003-01-24 02:26:29 (UTC)
commit8b2c18bb978c58de817ee163715f1e21982380a0 (patch) (unidiff)
tree6f8ab2a4778292d3cd3f9fbd6d5bf74c46f034a5
parent039367f738688f9484a487db8720a5bd2ad5878f (diff)
downloadopie-8b2c18bb978c58de817ee163715f1e21982380a0.zip
opie-8b2c18bb978c58de817ee163715f1e21982380a0.tar.gz
opie-8b2c18bb978c58de817ee163715f1e21982380a0.tar.bz2
Adjust package builds to handle the new lib paths
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks4
1 files changed, 4 insertions, 0 deletions
diff --git a/mkipks b/mkipks
index 97f78c5..4685f5f 100755
--- a/mkipks
+++ b/mkipks
@@ -106,48 +106,52 @@ do
106 else 106 else
107 for f in $files 107 for f in $files
108 do 108 do
109 if [ -d $f ] 109 if [ -d $f ]
110 then 110 then
111 ffiles=$(find $f -type f -o -type b -o -type c -o -type l) 111 ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
112 else 112 else
113 ffiles=$f 113 ffiles=$f
114 fi 114 fi
115 for ff in $ffiles 115 for ff in $ffiles
116 do 116 do
117 case $ff in 117 case $ff in
118 */CVS/*) 118 */CVS/*)
119 continue 119 continue
120 ;;*~) 120 ;;*~)
121 continue 121 continue
122 ;;*.control) 122 ;;*.control)
123 continue 123 continue
124 ;; $QTDIR/*) 124 ;; $QTDIR/*)
125 BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/}) 125 BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/})
126 ;; etc/*.d/*) 126 ;; etc/*.d/*)
127 BASE=$(dirname /$ff) 127 BASE=$(dirname /$ff)
128 ;; root/*) 128 ;; root/*)
129 BASE=$(dirname ${ff#root}) 129 BASE=$(dirname ${ff#root})
130 ;; lib/*)
131 BASE=$(dirname /opt/QtPalmtop/$ff)
132 ;; $OPIEDIR/lib/*)
133 BASE=$(dirname /opt/QtPalmtop/${ff#$OPIEDIR/})
130 ;; *) 134 ;; *)
131 # For SHARP ROM compatibility. Should change to Qtopia. 135 # For SHARP ROM compatibility. Should change to Qtopia.
132 BASE=/opt/QtPalmtop/$(dirname $ff) 136 BASE=/opt/QtPalmtop/$(dirname $ff)
133 esac 137 esac
134 138
135 if [ -f $ff -o -b $ff -o -c $ff ] 139 if [ -f $ff -o -b $ff -o -c $ff ]
136 then 140 then
137 D=$DATADIR$BASE 141 D=$DATADIR$BASE
138 if [ -x $ff -a -n "$STRIP" ] 142 if [ -x $ff -a -n "$STRIP" ]
139 then 143 then
140 case $(file $ff) in 144 case $(file $ff) in
141 $STRIP_FILES) 145 $STRIP_FILES)
142 $STRIP $ff 146 $STRIP $ff
143 ;; *) 147 ;; *)
144 esac 148 esac
145 fi 149 fi
146 if [ -n "$RPM" ] 150 if [ -n "$RPM" ]
147 then 151 then
148 case "$ff" in 152 case "$ff" in
149 /*) RPMFILES="$RPMFILES $ff" 153 /*) RPMFILES="$RPMFILES $ff"
150 ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" 154 ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
151 esac 155 esac
152 else 156 else
153 mkdir -p $D 157 mkdir -p $D