osmeditor2/Makefile.patch

   1 --- Makefile-orig       2006-12-09 15:28:02.592013000 +0100
   2 +++ Makefile    2006-12-09 15:49:51.644013000 +0100
   3 @@ -1,6 +1,7 @@
   4  DESTDIR =
   5 -prefix  = /usr/local
   6 +prefix  =
   7  bindir  = $(prefix)/bin
   8 +QTPREFIX =
   9
  10  CXX     = c++
  11  RM      = rm -f
  12 @@ -18,7 +19,7 @@
  13           NodeMetaDataHandler.o
  14  JEEPSSRC = jeeps-gpsbabel-1.2.7
  15  LIBS = -ljeeps
  16 -LIBPATH = -L$(JEEPSSRC) -L/usr/local/lib
  17 +LIBPATH = -L$(JEEPSSRC) -L$(prefix)/lib
  18
  19  SRTMOBJ = srtm.o Canvas.o SRTMGeneral.o SRTMDataGrid.o SRTMConGen.o llgr.o
  20
  21 @@ -28,11 +29,11 @@
  22  # Configure Qt paths
  23  # Hints if problems: try interchanging -lqt-mt and -lqt.
  24
  25 -# Mandrake 10.1
  26 -QTINCPATH = /usr/lib/qt3/include
  27 +# Archlinux
  28 +QTINCPATH = /opt/qt/include
  29  QTLIB = -lqt-mt
  30 -QTLIBPATH = -L/usr/lib/qt3/lib
  31 -MOC=/usr/lib/qt3/bin/moc
  32 +QTLIBPATH = -L/opt/qt/lib
  33 +MOC=/opt/qt/bin/moc
  34
  35  # Fedora Core 5
  36  #QTINCPATH = /usr/lib/qt-3.3/include
  37 @@ -58,7 +59,7 @@
  38  WARNFLAGS = -w
  39  DEBUGFLAGS = -g
  40  CXXFLAGS = $(WARNFLAGS) $(DEBUGFLAGS) -I$(QTINCPATH) \
  41 -       -I/usr/local/include $(OPTS) -I$(JEEPSSRC)
  42 +       -I$(prefix)/include $(OPTS) -I$(JEEPSSRC)
  43
  44
  45  # Uncomment for XMLRPC. You need xmlrpc-c for XMLRPC support.
  46 @@ -73,7 +74,7 @@
  47
  48  install: osmeditor2
  49         $(INSTALL) -d $(DESTDIR)$(bindir)
  50 -       $(INSTALL) osmeditor $(DESTDIR)$(bindir)/osmeditor
  51 +       $(INSTALL) osmeditor2 $(DESTDIR)$(bindir)/osmeditor
  52
  53  srtm: $(SRTMOBJ)
  54         $(CXX) -o srtm $(SRTMOBJ) -lgd -lpng -lz -ljpeg -lfreetype -lm