File fix-lib-path-for-builds-file.patch of Package icmake
diff -Ppdru icmake-12.00.00/icmake/build icmake-12.00.00-new/icmake/build
--- icmake-12.00.00/icmake/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/build 2024-05-23 18:17:23.983391212 +0200
@@ -69,21 +69,21 @@ echo "
# cp the default skeleton files to tmp/usr/share/icmake
- echo "default skeleton files in usr/share/icmake/ to tmp/usr/share/icmake
+ echo "default skeleton files in usr/share/icmake/ to tmp${SKELDIR}
"
- try cp -r usr/share/icmake/* tmp/usr/share/icmake/
+ try cp -r usr/share/icmake/* tmp${SKELDIR}/
# cp the config files in ./etc/icmake to tmp/etc/icmake
- echo "configuration files in etc/icmake to tmp/etc/icmake
+ echo "configuration files in etc/icmake to tmp${CONFDIR}
"
- try cp -r etc/icmake/* tmp/etc/icmake/
+ try cp -r etc/icmake/* tmp${CONFDIR}/
# manpages: write doc/manpage/release.yo
if [ -e doc/icmake.1 ] ; then
- cp doc/*.1 tmp/usr/share/man/man1
- cp doc/*.7 tmp/usr/share/man/man7
+ cp doc/*.1 tmp${MANDIR}/man1
+ cp doc/*.7 tmp${MANDIR}/man7
else
cd doc/manpage
echo "
@@ -92,14 +92,14 @@ SUBST(_CurYrs_)(${YEARS})" > release.yo
# manpages: "construct the uncompressed man-pages below tmp/usr/share/man/
- echo "construct the uncompressed man-pages in tmp/usr/share/man/man1
+ echo "construct the uncompressed man-pages in tmp${MANDIR}/man1
"
- MAN=../../tmp/usr/share/man/man1
+ MAN=../../tmp${MANDIR}/man1
yodl2man --no-warnings -o ${MAN}/icmake.1 -r 20000 icmake.yo
yodl2man --no-warnings -o ${MAN}/icmstart.1 icmstart.yo
yodl2man --no-warnings -o ${MAN}/icmbuild.1 icmbuild.yo
- MAN=../../tmp/usr/share/man/man7
+ MAN=../../tmp${MANDIR}/man7
yodl2man --no-warnings -o ${MAN}/icmstart.rc.7 icmstart.rc.yo
yodl2man --no-warnings -o ${MAN}/icmscript.7 icmscript.yo
@@ -111,15 +111,15 @@ SUBST(_CurYrs_)(${YEARS})" > release.yo
# manpages: "compress the man-pages below tmp/usr/share/man/
- echo "compress man-pages .1 in tmp/usr/share/man/man1
+ echo "compress man-pages .1 in tmp${MANDIR}/man1
"
- cd tmp/usr/share/man/man1
+ cd tmp${MANDIR}/man1
for x in *.1 ; do
gzip -9cn $x > $x.gz || exit 1
done
rm -f *.1
- echo "compress man-pages .7 in tmp/usr/share/man/man7
+ echo "compress man-pages .7 in tmp${MANDIR}/man7
"
cd ../man7
for x in *.7 ; do
@@ -131,13 +131,13 @@ SUBST(_CurYrs_)(${YEARS})" > release.yo
# install the doc/icmake files
- echo "compress changelog in tmp/usr/share/doc/icmake
+ echo "compress changelog in tmp${DOCDIR}
"
- gzip -9cn changelog > tmp/usr/share/doc/icmake/changelog.gz || exit 1
+ gzip -9cn changelog > tmp${DOCDIR}/changelog.gz || exit 1
- echo "cp examples files to tmp/usr/share/doc/icmake
+ echo "cp examples files to tmp${DOCDIR}
"
- try cp -r examples tmp/usr/share/doc/icmake
+ try cp -r examples tmp${DOCDIR}
echo "cp ./etc files to tmp/etc
"
diff -Ppdru icmake-12.00.00/icmake/buildscripts/multicomp icmake-12.00.00-new/icmake/buildscripts/multicomp
--- icmake-12.00.00/icmake/buildscripts/multicomp 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/buildscripts/multicomp 2024-05-23 17:38:40.046482982 +0200
@@ -4,7 +4,7 @@
# $1 is, e.g., /usr/libexec/icmake/icm-dep
. ../buildscripts/precomp
-
+. ../tmp/INSTALL.sh
build()
{
@@ -36,7 +36,7 @@ IFS='
ls *.cc >> jobs
opts=" -Wall -Werror -isystem ${BASE}/tmp"
- ../tmp/usr/libexec/icmake/icm-multicomp -q jobs \
+ ../tmp/${LIBDIR}/icm-multicomp -q jobs \
'/usr/bin/g++ -c -o $2 '${ICMAKE_CPPSTD}"${opts}"' $1' || exit 1
/usr/bin/g++ -o ../tmp/$1 tmp/*.o -L../tmp -licmake ${LDFLAGS} || exit 1
diff -Ppdru icmake-12.00.00/icmake/buildscripts/multicompobj icmake-12.00.00-new/icmake/buildscripts/multicompobj
--- icmake-12.00.00/icmake/buildscripts/multicompobj 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/buildscripts/multicompobj 2024-05-23 17:43:38.381659386 +0200
@@ -4,7 +4,8 @@
# $1 is, e.g., /usr/libexec/icmake/icm-dep
. ../buildscripts/precomp
-
+. ../tmp/INSTALL.sh
+
jobs()
{
count=0 # use o-file numbers to avoid name collisions
@@ -44,7 +45,7 @@ build()
# use -O2
export ICMAKE_CPPSTD="${ICMAKE_CPPSTD} -O2"
# multi-compile
- ../tmp/usr/libexec/icmake/icm-multicomp -q jobs
+ ../tmp${LIBDIR}/icm-multicomp -q jobs
# created the o-files .tgz
# tar czf ../tmp/usr/share/icmake/ofiles.tgz *.o
# clean up
diff -Ppdru icmake-12.00.00/icmake/buildscripts/precomp icmake-12.00.00-new/icmake/buildscripts/precomp
--- icmake-12.00.00/icmake/buildscripts/precomp 2024-05-23 17:34:26.303251036 +0200
+++ icmake-12.00.00-new/icmake/buildscripts/precomp 2024-05-23 17:45:32.393372029 +0200
@@ -1,15 +1,17 @@
# loaded and called from program's icm_bootstrap scripts
+. ../tmp/INSTALL.sh
+
precomp()
{
echo "
Buiding tmp/spch.gch and using .ih.gch files"
- ../tmp/usr/libexec/icmake/icm-spch $1 -k xerr/xerr.ih -l spch || exit 1
+ ../tmp${LIBDIR}/icm-spch $1 -k xerr/xerr.ih -l spch || exit 1
opts=" -Wall -Werror -O2 -isystem ../tmp"
- ../tmp/usr/libexec/icmake/icm-spch -p spch tmp/ \
+ ../tmp${LIBDIR}/icm-spch -p spch tmp/ \
'g++ -c -o $2 '"${ICMAKE_CPPSTD} ${opts}"' -x c++-header $1' || exit 1
- ../tmp/usr/libexec/icmake/icm-spch -s spch tmp/ || exit 1
+ ../tmp${LIBDIR}/icm-spch -s spch tmp/ || exit 1
rm spch
}
diff -Ppdru icmake-12.00.00/icmake/comp/build icmake-12.00.00-new/icmake/comp/build
--- icmake-12.00.00/icmake/comp/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/comp/build 2024-05-23 17:32:42.055566567 +0200
@@ -2,9 +2,10 @@
# icm-spch and icm-multicomp must be available
. ../buildscripts/multicomp
+. ../tmp/INSTALL.sh
echo "
-Building tmp/usr/libexec/icmake/icm-comp"
+Building tmp${LIBDIR}/icm-comp"
-build /usr/libexec/icmake/icm-comp
+build ${LIBDIR}/icm-comp
diff -Ppdru icmake-12.00.00/icmake/dep/build icmake-12.00.00-new/icmake/dep/build
--- icmake-12.00.00/icmake/dep/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/dep/build 2024-05-23 17:33:13.187472339 +0200
@@ -1,8 +1,9 @@
#!/bin/bash
. ../buildscripts/multicomp
+. ../tmp/INSTALL.sh
echo "
-Building tmp/usr/libexec/icmake/icm-dep"
+Building tmp${LIBDIR}/icm-dep"
-build /usr/libexec/icmake/icm-dep
+build ${LIBDIR}/icm-dep
diff -Ppdru icmake-12.00.00/icmake/exec/build icmake-12.00.00-new/icmake/exec/build
--- icmake-12.00.00/icmake/exec/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/exec/build 2024-05-23 17:32:56.923521566 +0200
@@ -1,8 +1,9 @@
#!/bin/bash
. ../buildscripts/multicomp
+. ../tmp/INSTALL.sh
echo "
-Building tmp/usr/libexec/icmake/icm-exec"
+Building tmp${LIBDIR}/icm-exec"
-build /usr/libexec/icmake/icm-exec
+build ${LIBDIR}/icm-exec
diff -Ppdru icmake-12.00.00/icmake/install icmake-12.00.00-new/icmake/install
--- icmake-12.00.00/icmake/install 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/install 2024-05-23 17:39:49.078274015 +0200
@@ -48,8 +48,8 @@ progs()
# maybe strip the binaries
if [ "$STRIP" == "strip" ] ; then
- try strip tmp/usr/bin/icmake tmp/usr/bin/icmbuild \
- tmp/usr/libexec/icmake/*
+ try strip tmp${BINDIR}/icmake tmp${BINDIR}/icmbuild \
+ tmp${LIBDIR}/*
echo
fi
diff -Ppdru icmake-12.00.00/icmake/multicmp/build icmake-12.00.00-new/icmake/multicmp/build
--- icmake-12.00.00/icmake/multicmp/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/multicmp/build 2024-05-23 17:33:19.887452060 +0200
@@ -6,13 +6,14 @@
. ../buildscripts/precomp
. ../buildscripts/build
+. ../tmp/INSTALL.sh
echo "
-Building tmp/usr/libexec/icmake/icm-multicomp"
+Building tmp${LIBDIR}/icm-multicomp"
# do the precompilation
precomp
# execute build installing the program in the destination dir.
-build /usr/libexec/icmake/icm-multicomp
+build ${LIBDIR}/icm-multicomp
find ./ -name '*.gch' -exec rm {} \;
diff -Ppdru icmake-12.00.00/icmake/pp/build icmake-12.00.00-new/icmake/pp/build
--- icmake-12.00.00/icmake/pp/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/pp/build 2024-05-23 17:33:24.487438137 +0200
@@ -1,8 +1,9 @@
#!/bin/bash
. ../buildscripts/multicomp
+. ../tmp/INSTALL.sh
echo "
-Building tmp/usr/libexec/icmake/icm-pp"
+Building tmp${LIBDIR}/icm-pp"
-build /usr/libexec/icmake/icm-pp
+build ${LIBDIR}/icm-pp
diff -Ppdru icmake-12.00.00/icmake/prepare icmake-12.00.00-new/icmake/prepare
--- icmake-12.00.00/icmake/prepare 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/prepare 2024-05-23 17:42:37.793812104 +0200
@@ -63,9 +63,9 @@ YEARS=\"${YEARS}\"" > tmp/INSTALL.sh
echo "Creating intermediate construction directories below ./tmp"
-try mkdir -p tmp/usr/bin tmp/usr/libexec/icmake tmp/usr/share/icmake
-try mkdir -p tmp/etc/icmake tmp/usr/share/man/man1
-try mkdir -p tmp/usr/share/man/man7 tmp/usr/share/doc/icmake
+try mkdir -p tmp${BINDIR} tmp${LIBDIR} tmp${SKELDIR}
+try mkdir -p tmp${CONFDIR} tmp${MANDIR}/man1
+try mkdir -p tmp${MANDIR}/man7 tmp${DOCDIR}
echo
echo Next: call ./buildlib x
diff -Ppdru icmake-12.00.00/icmake/spch/build icmake-12.00.00-new/icmake/spch/build
--- icmake-12.00.00/icmake/spch/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/spch/build 2024-05-23 17:33:30.167420945 +0200
@@ -2,10 +2,11 @@
# make ../bootstrap/build available in the current directory
. ../buildscripts/build
+. ../tmp/INSTALL.sh
echo "
-Building tmp/usr/libexec/icmake/icm-spch"
+Building tmp${LIBDIR}/icm-spch"
# execute build installing the program in the destination dir,
# which is under TMP_DIR
-build /usr/libexec/icmake/icm-spch
+build ${LIBDIR}/icm-spch
diff -Ppdru icmake-12.00.00/icmake/un/build icmake-12.00.00-new/icmake/un/build
--- icmake-12.00.00/icmake/un/build 2024-04-03 21:39:10.000000000 +0200
+++ icmake-12.00.00-new/icmake/un/build 2024-05-23 17:33:39.367393099 +0200
@@ -1,8 +1,9 @@
#!/bin/bash
. ../buildscripts/multicomp
+. ../tmp/INSTALL.sh
echo "
-Building tmp/usr/libexec/icmake/icmun"
+Building tmp${LIBDIR}/icmun"
-build /usr/libexec/icmake/icmun
+build ${LIBDIR}/icmun
