From: Bob Finch Date: Thu, 25 Nov 2010 20:30:48 +0000 (-0700) Subject: Updated AltOS PKGBUILD to track makefile changes X-Git-Tag: debian/0.7.1+168+gcb08bc2~8 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b74cec6cd0bc043f53e9e28472765aa343136813;hp=f88bde21d76a4ff91099a5051153ebace1619978 Updated AltOS PKGBUILD to track makefile changes --- diff --git a/contrib/arch-linux/PKGBUILD-git.altos b/contrib/arch-linux/PKGBUILD-git.altos index 0a3ecec5..4210bc3a 100644 --- a/contrib/arch-linux/PKGBUILD-git.altos +++ b/contrib/arch-linux/PKGBUILD-git.altos @@ -1,6 +1,6 @@ # Original contributor: Bob Finch pkgname=altos-git -pkgver=20101031 +pkgver=20101125 pkgrel=1 pkgdesc="Software solutions for high powered rocketry avionics" arch=('i686' 'x86_64') @@ -51,7 +51,7 @@ build() { # --with-fat-dir=$srcdir # Use this ^ for placing all 3 "fat" packages (linux,mac,windows) into a numbered dir. - cd "$srcdir/$_gitname-build/ao-tools/$_pkgname/" + cd "$srcdir/$_gitname-build/$_pkgname/" sed -i 's:\$(datadir)/java:\$(datadir)/java/altos:' Makefile # This ^ places altosui.jar in an 'altos' subdirectory. sed -i 's:\${exec_prefix}/bin:\${exec_prefix}/share/java/altos:' Makefile @@ -61,7 +61,7 @@ build() { sed -i 's:cp -p $(JFREECHART_CLASS):cp -p $(JFREECHART_CLASS) $(JCOMMON_CLASS):' Makefile # This ^ includes jcommon.jar in the macosx fat package. - cd "$srcdir/$_gitname-build/ao-tools/$_libname/" + cd "$srcdir/$_gitname-build/$_pkgname/$_libname/" sed -i 's:$(JVM_INCLUDE):/opt/java/include\ -I/opt/java/include/linux:' Makefile # This ^ enables both jni.h and jni_md.h to be found as required. @@ -75,7 +75,7 @@ build() { cd "$srcdir/$_gitname-build/doc" make all - cd "$srcdir/$_gitname-build/ao-tools/altosui" + cd "$srcdir/$_gitname-build/$_pkgname" make fat }