* fixed location of units

install/debian/fixdeb

@@ -3,16 +3,19 @@
 # Create debian files from *.in files
 #
 # $1 = path to debian files
+# $2 = fpc target (i386-linux)
+# $3 = ppcXXX binary name (ppc386)
 #
-if [ $# != 2 ]; then
-  echo 'Usage : fixdeb path ppcbin'
+if [ $# != 3 ]; then
+  echo 'Usage : fixdeb path fpctarget ppcbin'
   exit 1
 fi
 
 PACKAGEVERSION=`head -n 1 $1/changelog | awk '{ print $2 }' | tr -d '[()]'`
 FPCVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $1 }'`
 DEBVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $2 }'`
-PPCBIN="$2"
+FPCTARGET="$2"
+PPCBIN="$3"
 
 # Snapshot ?
 if [ "$DEBVERSION" == "0" ]; then
@@ -25,11 +28,12 @@ fi
 
 echo 'PackageVersion: ' $PACKAGEVERSION
 echo 'FPCVersion    : ' $FPCVERSION
+echo 'FPCTarget     : ' $FPCTARGET
 echo 'DebVersion    : ' $DEBVERSION
 echo 'PPCBin        : ' $PPCBIN
 
 for i in $1/*.in
 do
   j=${i/%.in/}
-  sed -e 's/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g;s/%{ppcbin}/'$PPCBIN'/g' $i > $j
+  sed -e 's/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g;s/%{ppcbin}/'$PPCBIN'/g;s/%{fpctarget}/'$FPCTARGET'/g' $i > $j
 done

install/debian/fp-units-base.install.in

@@ -1,8 +1,8 @@
 /usr/share/doc/fp-units-base
 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib
-/usr/lib/fpc/%{fpcversion}/units/linux/pasjpeg
-/usr/lib/fpc/%{fpcversion}/units/linux/ncurses
-/usr/lib/fpc/%{fpcversion}/units/linux/x11
-/usr/lib/fpc/%{fpcversion}/units/linux/regexpr
-/usr/lib/fpc/%{fpcversion}/units/linux/md5
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/paszlib
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pasjpeg
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ncurses
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/x11
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/regexpr
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/md5

install/debian/fp-units-db.install.in

@@ -1,9 +1,9 @@
 /usr/share/doc/fp-units-db
 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase
-/usr/lib/fpc/%{fpcversion}/units/linux/postgres
-/usr/lib/fpc/%{fpcversion}/units/linux/oracle
-/usr/lib/fpc/%{fpcversion}/units/linux/odbc
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbm
-/usr/lib/fpc/%{fpcversion}/units/linux/sqlite
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/mysql
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ibase
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/postgres
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/oracle
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/odbc
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gdbm
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/sqlite

install/debian/fp-units-fcl.install.in

@@ -1,2 +1,2 @@
 /usr/share/doc/fp-units-fcl
-/usr/lib/fpc/%{fpcversion}/units/linux/fcl
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl

install/debian/fp-units-gfx.install.in

@@ -1,10 +1,10 @@
 /usr/share/doc/fp-units-gfx
 
-/usr/lib/fpc/%{fpcversion}/units/linux/opengl
-/usr/lib/fpc/%{fpcversion}/units/linux/forms
-/usr/lib/fpc/%{fpcversion}/units/linux/svgalib
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi
-/usr/lib/fpc/%{fpcversion}/units/linux/libgd
-/usr/lib/fpc/%{fpcversion}/units/linux/libpng
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/opengl
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/forms
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/svgalib
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ggi
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libgd
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libpng
 
 /usr/bin/fd2pascal

install/debian/fp-units-gnome1.install.in

@@ -1,6 +1,6 @@
 /usr/share/doc/fp-units-gnome1
 
-/usr/lib/fpc/%{fpcversion}/units/linux/imlib
-/usr/lib/fpc/%{fpcversion}/units/linux/gnome
-/usr/lib/fpc/%{fpcversion}/units/linux/gconf
-/usr/lib/fpc/%{fpcversion}/units/linux/zvt
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/imlib
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gnome
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gconf
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/zvt

install/debian/fp-units-gtk.install.in

@@ -1,4 +1,4 @@
 /usr/share/doc/fp-units-gtk
 
-/usr/lib/fpc/%{fpcversion}/units/linux/gtk
-/usr/lib/fpc/%{fpcversion}/units/linux/fpgtk
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gtk
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fpgtk

install/debian/fp-units-misc.install.in

@@ -1,13 +1,13 @@
 /usr/share/doc/fp-units-misc
 
-/usr/lib/fpc/%{fpcversion}/units/linux/utmp
-/usr/lib/fpc/%{fpcversion}/units/linux/libc
-/usr/lib/fpc/%{fpcversion}/units/linux/pthreads
-/usr/lib/fpc/%{fpcversion}/units/linux/unixutil
-/usr/lib/fpc/%{fpcversion}/units/linux/zlib
-/usr/lib/fpc/%{fpcversion}/units/linux/tcl
-/usr/lib/fpc/%{fpcversion}/units/linux/cdrom
-/usr/lib/fpc/%{fpcversion}/units/linux/bfd
-/usr/lib/fpc/%{fpcversion}/units/linux/syslog
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbint
-/usr/lib/fpc/%{fpcversion}/units/linux/unzip
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/utmp
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libc
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pthreads
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/unixutil
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/zlib
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/tcl
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/cdrom
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/bfd
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/syslog
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gdbint
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/unzip

install/debian/fp-units-net.install.in

@@ -1,5 +1,5 @@
 /usr/share/doc/fp-units-net
 
-/usr/lib/fpc/%{fpcversion}/units/linux/inet
-/usr/lib/fpc/%{fpcversion}/units/linux/netdb
-/usr/lib/fpc/%{fpcversion}/units/linux/libasync
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/inet
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/netdb
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libasync

install/debian/fp-units-rtl.install.in

@@ -1 +1 @@
-/usr/lib/fpc/%{fpcversion}/units/linux/rtl
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/rtl

install/debian/fp-utils.install.in

@@ -16,10 +16,7 @@
 /usr/bin/fprcp
 /usr/bin/fpdoc
 /usr/bin/makeskel
-/usr/lib/fpc/%{fpcversion}/units/linux/lexlib.ppu
-/usr/lib/fpc/%{fpcversion}/units/linux/yacclib.ppu
-/usr/lib/fpc/%{fpcversion}/units/linux/lexlib.o
-/usr/lib/fpc/%{fpcversion}/units/linux/yacclib.o
+/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/lexyacc
 /usr/lib/fpc/lexyacc/yylex.cod
 /usr/lib/fpc/lexyacc/yyparse.cod
 /usr/share/man/man1/delp.1

install/debian/rules

@@ -44,6 +44,7 @@ FPCDIR=
 # Get Package version and FPC version out of changelog file
 PACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
 FPCVERSION:=$(shell echo $(PACKAGEVERSION) | awk -F '-' '{ print $$1 }')
+FPCTARGET=$(CPU_TARGET)-linux
 # Get directories	
 PWD:=$(shell pwd)
 BUILD_DIR=$(PWD)/debian/build
@@ -97,7 +98,7 @@ clean:
 debian-files: debian-files-stamp
 debian-files-stamp:
 	@echo "--- Creating debian files"
-	bash debian/fixdeb debian $(PPNEW)
+	bash debian/fixdeb debian $(FPCTARGET) $(PPNEW)
 
 	touch debian-files-stamp