mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong --prefix and DESTDIR usage (also needs buildsystem)

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1029 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eb0338560
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-15 (Sat, 15 Jan 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2011-01-15 17:27:57 +00:00
parent 0e4afaadc5
commit c0a3e0ca5b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acinclude.m4
View File

@@ -256,10 +256,10 @@ fi
AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[
AC_REQUIRE([TUXBOX_APPS_PKGCONFIG])
AC_MSG_CHECKING(for package $2)
if PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --exists "$2" ; then
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
$1_CFLAGS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --cflags "$2")
$1_LIBS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --libs "$2")
$1_CFLAGS=$($PKG_CONFIG --cflags "$2")
$1_LIBS=$($PKG_CONFIG --libs "$2")
else
AC_MSG_RESULT(no)
fi

2
data/scripts/Makefile.am
View File

@@ -1,4 +1,4 @@
installdir = $(DESTDIR)$(bindir)
installdir = $(bindir)
install_DATA = \
backup.sh \

4
src/nhttpd/web/scripts/Makefile.am
View File

@@ -3,5 +3,5 @@ installdir = $(DATADIR)/neutrino/httpd/scripts
install_DATA= api.sh _Y_Globals.sh _Y_Library.sh Y_Live.sh Y_Tools.sh
install-data-hook:
chmod 0755 $(DATADIR)/neutrino/httpd/scripts/api.sh
chmod 0755 $(DATADIR)/neutrino/httpd/scripts/Y_*.sh
chmod 0755 $(DESTDIR)$(DATADIR)/neutrino/httpd/scripts/api.sh
chmod 0755 $(DESTDIR)$(DATADIR)/neutrino/httpd/scripts/Y_*.sh