projects
/
sigrok-util.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63fc42f
)
sigrok-native-appimage: Use $STATIC_FILES.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Wed, 1 Mar 2017 18:01:57 +0000
(19:01 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sun, 19 Mar 2017 20:16:46 +0000
(21:16 +0100)
cross-compile/appimage/sigrok-native-appimage
patch
|
blob
|
history
diff --git
a/cross-compile/appimage/sigrok-native-appimage
b/cross-compile/appimage/sigrok-native-appimage
index 767b634b1c9b741b0232cf4403f672e833467cbd..2815b2c04992e7ab4d1d08e398e98f54693c46d2 100755
(executable)
--- a/
cross-compile/appimage/sigrok-native-appimage
+++ b/
cross-compile/appimage/sigrok-native-appimage
@@
-30,7
+30,7
@@
A="./$APP/$APP.AppDir"
mkdir -p $A/usr/bin $A/usr/lib $A/usr/share
cd ./$APP
mkdir -p $A/usr/bin $A/usr/lib $A/usr/share
cd ./$APP
-.
../contrib
/functions.sh
+.
$STATIC_FILES
/functions.sh
########################################################################
# Get build products from $PREFIX
########################################################################
# Get build products from $PREFIX
@@
-58,7
+58,8
@@
cp $APPIMAGEKIT_OUTDIR/AppRun .
# Copy desktop and icon file to AppDir for AppRun to pick them up
########################################################################
# Copy desktop and icon file to AppDir for AppRun to pick them up
########################################################################
-cp ../../contrib/pulseview.desktop ../../contrib/sigrok-logo-notext.png .
+cp $STATIC_FILES/pulseview.desktop .
+cp $STATIC_FILES/sigrok-logo-notext.png .
########################################################################
# Copy in the dependencies that cannot be assumed to be available
########################################################################
# Copy in the dependencies that cannot be assumed to be available