aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/albumshaper/files/fixpaths.patch
blob: 34ca2e380438dc43704b39559927549627aa6284 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- albumshaper_2.1_src/Makefile~fixpaths
+++ albumshaper_2.1_src/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: bin/AlbumShaper.bin
-# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May  9 12:09:27 2006
+# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May  9 13:58:45 2006
 # Project:  AlbumShaper.pro
 # Template: app
 # Command: $(QMAKE) -spec /local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -after  "CONFIG+=thread" -o Makefile AlbumShaper.pro
@@ -12,14 +12,14 @@
 CXX      = $(OE_QMAKE_CXX)
 LEX      = flex
 YACC     = yacc
-CFLAGS   = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+CFLAGS   = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
 LEXFLAGS = 
 YACCFLAGS= -d
 INCPATH  = -I/local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -I. -I$(OE_QMAKE_INCDIR_QT) -Itmp/
 LINK     = $(OE_QMAKE_LINK)
 LFLAGS   = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -s  -Wl,-rpath-link,$(OE_QMAKE_LIBDIR_QT)
-LIBS     = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/usr/lib -lxslt -lxml2 -lz -lm -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
+LIBS     = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxslt -lxml2 -lz -lm -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
 AR       = $(OE_QMAKE_AR) cqs
 RANLIB   = 
 MOC      = $(OE_QMAKE_MOC)
@@ -1377,7 +1377,7 @@
 
 install_scripts: all 
 	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/"
-	cp -f bin/AlbumShaper /usr/bin/AlbumShaper;
+	cp -f bin/AlbumShaper $(INSTALL_ROOT)//usr/bin/AlbumShaper;
 
 
 install: install_target install_images install_text install_themes install_translations install_xmlConversion install_scripts  
--- albumshaper_2.1_src/AlbumShaper.pro~fixpaths
+++ albumshaper_2.1_src/AlbumShaper.pro
@@ -272,7 +272,7 @@
 
 #--------- Launcher Script (Linux/FreeBSD) ------------
 !mac:unix:scripts.path = $${BIN_DIR}
-!mac:unix:scripts.commands = cp -f bin/AlbumShaper $${BIN_DIR}/AlbumShaper;
+!mac:unix:scripts.commands = cp -f bin/AlbumShaper $(INSTALL_ROOT)/$${BIN_DIR}/AlbumShaper;
 
 
 #===========================================================================================