libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

futher adjustments

This commit is contained in:
Jack Andersen 2015-06-16 15:02:58 -10:00
parent 96ed8a2ce2
commit b195c194f7
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atdna/PKGBUILD
View File

@ -1,7 +1,7 @@
# PKGBUILD for atdna # PKGBUILD for atdna
_pkgname=atdna _pkgname=atdna
pkgname=$_pkgname-git pkgname=$_pkgname-git
pkgver=1.1.0.18.g2bb60ab pkgver=1.1.0.19.g96ed8a2
pkgrel=1 pkgrel=1
pkgdesc="Companion DNA utility for libAthena" pkgdesc="Companion DNA utility for libAthena"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -20,11 +20,11 @@ pkgver() {
build() { build() {
cd "$srcdir/$_pkgname/atdna" cd "$srcdir/$_pkgname/atdna"
qmake PREFIX="$pkgdir/usr" && make qmake PREFIX="$pkgdir/usr" INSTALL_PREFIX="/usr" && make
} }
package() { package() {
cd "$srcdir/$_pkgname/atdna" cd "$srcdir/$_pkgname/atdna"
qmake PREFIX="$pkgdir/usr" && make install qmake PREFIX="$pkgdir/usr" INSTALL_PREFIX="/usr" && make install
} }

8
atdna/atdna.pro
View File

@ -58,6 +58,9 @@ unix {
isEmpty(PREFIX) { isEmpty(PREFIX) {
PREFIX = /usr/local PREFIX = /usr/local
} }
isEmpty(INSTALL_PREFIX) {
INSTALL_PREFIX = /usr/local
}
utilFiles.path = $$PREFIX/bin utilFiles.path = $$PREFIX/bin
utilFiles.files = $$OUT_PWD/atdna utilFiles.files = $$OUT_PWD/atdna
INSTALLS += utilFiles INSTALLS += utilFiles
@ -67,10 +70,13 @@ win32 {
isEmpty(PREFIX) { isEmpty(PREFIX) {
PREFIX = $$PWD/pkg PREFIX = $$PWD/pkg
} }
isEmpty(INSTALL_PREFIX) {
INSTALL_PREFIX = $$PWD/pkg
}
utilFiles.path = $$PREFIX/bin utilFiles.path = $$PREFIX/bin
utilFiles.files = $$OUT_PWD/atdna utilFiles.files = $$OUT_PWD/atdna
INSTALLS += utilFiles INSTALLS += utilFiles
} }
DEFINES += SYSTEM_PREFIX="$$PREFIX" DEFINES += INSTALL_PREFIX="$$INSTALL_PREFIX"

1
atdna/main.cpp
View File

@ -14,7 +14,6 @@
#ifndef SYSTEM_PREFIX #ifndef SYSTEM_PREFIX
#define SYSTEM_PREFIX /usr/local #define SYSTEM_PREFIX /usr/local
#endif #endif
#define XSTR(s) STR(s) #define XSTR(s) STR(s)
#define STR(s) #s #define STR(s) #s