diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-05-09 12:02:56 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-09 12:02:56 +0000 |
| commit | b9c1fc3a50ed2a06cf9c5425942cbf69ea9bdf61 (patch) | |
| tree | f870a2a76f024f86ad59c17b0564764d1cc876a3 /packages/albumshaper/files/fixpaths.patch | |
| parent | ba713f6d2774c1fece3fefdec4ccae1f271b586b (diff) | |
add albumshaper (qt3x11), open source application for organizing, annotating, framing, enhancing, stylizing, and sharing your digital photos
Diffstat (limited to 'packages/albumshaper/files/fixpaths.patch')
| -rw-r--r-- | packages/albumshaper/files/fixpaths.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/packages/albumshaper/files/fixpaths.patch b/packages/albumshaper/files/fixpaths.patch new file mode 100644 index 0000000000..34ca2e3804 --- /dev/null +++ b/packages/albumshaper/files/fixpaths.patch @@ -0,0 +1,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; + + + #=========================================================================================== |