summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kpicosim
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:11:35 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:11:35 +0200
commit01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 (patch)
tree44a49e67fe0e2b487938d3af116a8804950c8ca7 /redhat/applications/kpicosim
parent4a5605e233305678da64153c9664a0d06f00bcbe (diff)
downloadtde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.tar.gz
tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.zip
RHEL/Fedora: more application fixes ...
Diffstat (limited to 'redhat/applications/kpicosim')
-rw-r--r--redhat/applications/kpicosim/trinity-kpicosim.spec10
1 files changed, 5 insertions, 5 deletions
diff --git a/redhat/applications/kpicosim/trinity-kpicosim.spec b/redhat/applications/kpicosim/trinity-kpicosim.spec
index d162b6413..e6fcf0466 100644
--- a/redhat/applications/kpicosim/trinity-kpicosim.spec
+++ b/redhat/applications/kpicosim/trinity-kpicosim.spec
@@ -6,7 +6,7 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
@@ -53,11 +53,11 @@ simulator and export functions to VHDL, HEX and MEM files.
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
- -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"