aboutsummaryrefslogtreecommitdiff
path: root/tools/Linux
diff options
context:
space:
mode:
Diffstat (limited to 'tools/Linux')
-rwxr-xr-xtools/Linux/packaging/debian/rules12
-rwxr-xr-xtools/Linux/packaging/ppa-builder.sh3
2 files changed, 10 insertions, 5 deletions
diff --git a/tools/Linux/packaging/debian/rules b/tools/Linux/packaging/debian/rules
index 82cdb77761..d3df533f9b 100755
--- a/tools/Linux/packaging/debian/rules
+++ b/tools/Linux/packaging/debian/rules
@@ -16,14 +16,16 @@ endif
# List of options to pass to configure. Can be overridden.
XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
- --enable-debug --enable-optimizations --enable-gl --enable-vdpau \
- --disable-profiling --enable-joystick --enable-xrandr --enable-goom \
- --disable-ccache --enable-pulse --disable-dvdcss --enable-avahi \
- --disable-non-free --enable-external-libraries
+ --enable-optimizations --enable-gl --enable-vdpau \
+ --disable-profiling --enable-joystick --enable-xrandr \
+ --enable-goom --disable-ccache --enable-pulse --enable-avahi
# Ubuntu or Debian specific options
ifeq (Ubuntu,$(shell lsb_release -is))
XBMC_CONFIG_OPTIONS += --enable-faac
+else
+ XBMC_CONFIG_OPTIONS += --enable-external-libraries --disable-dvdcss \
+ --disable-non-free --enable-debug
endif
# Add the SVN revision if we could determine the svn revision
@@ -96,7 +98,7 @@ override_dh_link:
LINK_DESTINATION="$$(echo "$$FILE" | sed -e 's|debian/xbmc-bin/usr/lib|usr/share|')"; \
dh_link -pxbmc-bin "$$LINK_TARGET" "$$LINK_DESTINATION"; \
done
- find debian/xbmc-data/usr/share/xbmc -type d -empty -delete
+ [ -d debian/xbmc-data ] && find debian/xbmc-data/usr/share/xbmc -type d -empty -delete
override_dh_strip:
dh_strip --dbg-package=xbmc-dbg
diff --git a/tools/Linux/packaging/ppa-builder.sh b/tools/Linux/packaging/ppa-builder.sh
index e3ea0b824a..f94cf77bb8 100755
--- a/tools/Linux/packaging/ppa-builder.sh
+++ b/tools/Linux/packaging/ppa-builder.sh
@@ -100,6 +100,9 @@ preparesrc()
svn cleanup $SVNSRC
svn export $SVNSRC $DESTSRC
fi
+ cd $DESTSRC
+ ./bootstrap
+ cd $OLDPWD
echo "Copying to .orig folder"
cp -a $DESTSRC $DESTSRC.orig
}