--- marote-3.1.orig/marote.pro
+++ marote-3.1/marote.pro
@@ -1,6 +1,11 @@
TEMPLATE = app
LANGUAGE = C++
+DEB_BUILD = $$system(echo \$DEB_BUILD_OPTIONS)
+ contains(DEB_BUILD, nostrip) {
+ QMAKE_STRIP=:
+ }
+
CONFIG += qt-mt thread release
HEADERS += k2.h \
@@ -31,7 +36,7 @@
yellowLED.png \
k2bkgnd.png
-target.path = /usr/local/bin
+target.path = /usr/bin
INSTALLS += target
--- marote-3.1.orig/Makefile
+++ marote-3.1/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: marote
-# Generated by qmake (1.07a) (Qt 3.3.6) on: Tue Aug 22 14:45:46 2006
+# Generated by qmake (1.07a) (Qt 3.3.7) on: Sat Feb 9 22:09:13 2008
# Project: marote.pro
# Template: app
# Command: $(QMAKE) -o Makefile marote.pro
@@ -8,22 +8,22 @@
####### Compiler, tools and options
-CC = i686-pc-linux-gnu-gcc
-CXX = i686-pc-linux-gnu-g++
+CC = gcc
+CXX = g++
LEX = flex
YACC = yacc
-CFLAGS = -pipe -Wall -W -O2 -march=athlon-xp -pipe -fno-strict-aliasing -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -march=athlon-xp -pipe -fno-strict-aliasing -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
+CFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
+CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
LEXFLAGS =
YACCFLAGS= -d
-INCPATH = -I/usr/qt/3/mkspecs/linux-g++ -I. -I$(QTDIR)/include
-LINK = i686-pc-linux-gnu-g++
+INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I/usr/include/qt3
+LINK = g++
LFLAGS =
-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
+LIBS = $(SUBLIBS) -L/usr/share/qt3/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
AR = ar cqs
RANLIB =
-MOC = $(QTDIR)/bin/moc
-UIC = $(QTDIR)/bin/uic
+MOC = /usr/share/qt3/bin/moc
+UIC = /usr/share/qt3/bin/uic
QMAKE = qmake
TAR = tar -cf
GZIP = gzip -9f
@@ -123,7 +123,7 @@
$(MOC):
( cd $(QTDIR)/src/moc && $(MAKE) )
-Makefile: marote.pro /usr/qt/3/mkspecs/linux-g++/qmake.conf /usr/qt/3/lib/libqt-mt.prl
+Makefile: marote.pro /usr/share/qt3/mkspecs/default/qmake.conf /usr/share/qt3/lib/libqt-mt.prl
$(QMAKE) -o Makefile marote.pro
qmake:
@$(QMAKE) -o Makefile marote.pro
@@ -256,13 +256,13 @@
####### Install
install_target: all
- @$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/bin/"
- -$(INSTALL_FILE) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
- -strip "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+ @$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/"
+ -$(INSTALL_FILE) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
+ -strip "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
uninstall_target:
- -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
- -$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/bin/"
+ -$(DEL_FILE) "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
+ -$(DEL_DIR) "$(INSTALL_ROOT)/usr/bin/"
install: install_target