Removed the reference to OS specific stuff for Debian package. We are already in an OS specific environment.

cusax-fix
Martin Andre 19 years ago
parent f35da67aea
commit 75e4303364

@ -6,6 +6,5 @@ usr/share/menu
usr/share/pixmaps
usr/share/sip-communicator
usr/share/sip-communicator/lib
usr/share/sip-communicator/lib/os-specific
usr/share/sip-communicator/lib/bundle
usr/share/sip-communicator/sc-bundles

@ -47,13 +47,13 @@ install: build
cp debian/sip-communicator-16.xpm debian/sip-communicator/usr/share/pixmaps/
cp debian/sip-communicator.svg debian/sip-communicator/usr/share/pixmaps/
cp debian/sip-communicator.desktop debian/sip-communicator/usr/share/applications/
cp $(BASEDIR)/lib/kxml-min.jar debian/sip-communicator/usr/share/sip-communicator/lib
cp $(BASEDIR)/lib/jdic-all.jar debian/sip-communicator/usr/share/sip-communicator/lib
cp $(BASEDIR)/lib/felix.jar debian/sip-communicator/usr/share/sip-communicator/lib
cp $(BASEDIR)/lib/servicebinder.jar debian/sip-communicator/usr/share/sip-communicator/lib
cp $(BASEDIR)/resources/install/logging.properties debian/sip-communicator/usr/share/sip-communicator/lib
cp $(BASEDIR)/lib/felix.client.run.properties debian/sip-communicator/usr/share/sip-communicator/lib
cp $(BASEDIR)/lib/os-specific/linux/*.* debian/sip-communicator/usr/share/sip-communicator/lib/os-specific
cp $(BASEDIR)/lib/kxml-min.jar debian/sip-communicator/usr/share/sip-communicator/lib/
cp $(BASEDIR)/lib/jdic-all.jar debian/sip-communicator/usr/share/sip-communicator/lib/
cp $(BASEDIR)/lib/felix.jar debian/sip-communicator/usr/share/sip-communicator/lib/
cp $(BASEDIR)/lib/servicebinder.jar debian/sip-communicator/usr/share/sip-communicator/lib/
cp $(BASEDIR)/resources/install/logging.properties debian/sip-communicator/usr/share/sip-communicator/lib/
cp $(BASEDIR)/lib/felix.client.run.properties debian/sip-communicator/usr/share/sip-communicator/lib/
cp $(BASEDIR)/lib/os-specific/linux/jdic_stub.jar debian/sip-communicator/usr/share/sip-communicator/lib/
cp -r $(BASEDIR)/lib/native/linux debian/sip-communicator/usr/share/sip-communicator/lib/native
rm -rf debian/sip-communicator/usr/share/sip-communicator/lib/native/CVS
cp $(BASEDIR)/lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar debian/sip-communicator/usr/share/sip-communicator/lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar

@ -18,7 +18,6 @@ javabin=`which java`
SCDIR=/usr/share/sip-communicator
LIBPATH=$SCDIR/lib
OSLIBPATH=$LIBPATH/os-specific
#set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's)
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native
@ -33,6 +32,6 @@ cd $SCDIR
if [ -f $javabin ]
then
$javabin -classpath "$OSLIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/kxml-min.jar:$LIBPATH/servicebinder.jar:$LIBPATH/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:$LIBPATH/BrowserLauncher2.jar:$SCDIR/sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
$javabin -classpath "$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/kxml-min.jar:$LIBPATH/servicebinder.jar:$LIBPATH/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:$SCDIR/sc-bundles/util.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
exit $?
fi

Loading…
Cancel
Save