Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv3391
Modified Files:
Tag: OPENOFFICE_ORG680
rules
Log Message:
don't use unx*pro, get the info from the envfile
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.27
retrieving revision 1.214.2.14.2.28
diff -u -d -r1.214.2.14.2.27 -r1.214.2.14.2.28
--- rules 24 Mar 2005 22:17:34 -0000 1.214.2.14.2.27
+++ rules 25 Mar 2005 00:18:46 -0000 1.214.2.14.2.28
@@ -415,7 +415,7 @@
$(PKGDIR)-core/usr/share/applications
# Nasty menu icons hack, urgently needs better version
- dirname="`cd $(SOURCE_TREE)/sysui/unx*.pro/misc/desktopshare; pwd`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare; pwd`" ;\
for p in writer calc impress draw math base; do \
mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
sed -e 's,Exec=openoffice.org-1.9 \(.*\) %U,Exec=ooffice$(VER) \1
%U,' \
@@ -497,7 +497,7 @@
dh_installdirs -i
# Icons
- cd $(SOURCE_TREE)/sysui/unx*.pro/misc/redhat/usr/share/icons &&\
+ cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/redhat/usr/share/icons &&\
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d ||
exit 1 ;\
done &&\
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
