File amap-Path_corrections-5.2.patch of Package amap

Index: Makefile.am
===================================================================
--- Makefile.am.orig	2005-09-22 17:39:18.000000000 +0200
+++ Makefile.am	2009-03-21 00:08:33.000000000 +0100
@@ -1,13 +1,13 @@
 CC=gcc
-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
-OPT=-O2
+LIB=-lpcre
+OPT=$(RPM_OPT_FLAGS)
 OPT_DEBUG=-ggdb -Wall -lefence
-BINDIR=/bin
-DATADIR=/etc
-MANDIR=/man/man1
+BINDIR=/usr/bin
+DATADIR=/usr/share/amap
+MANDIR=/usr/share/man/man1
 SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
 MANPAGE=amap.1
-all:	pcre strip
+all:	amap amapcrap
 
 pcre:
 	cd pcre-3.9 && make
@@ -34,15 +34,15 @@ debug:	amap.c
 	$(CC) $(OPT_DEBUG) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
 
 install:	all
-	@echo Installing to $(PREFIX), change this by running ./configure --prefix=path
-	-mkdir -vp $(PREFIX)$(BINDIR) 2> /dev/null
-	-mkdir -vp $(PREFIX)$(DATADIR) 2> /dev/null
-	-mkdir -vp $(PREFIX)$(MANDIR) 2> /dev/null
-	-test -e amap.exe || cp -f amap amap6 amapcrap $(PREFIX)$(BINDIR)
-	-test -e amap.exe && cp -f amap.exe amapcrap.exe $(PREFIX)$(BINDIR) || echo
-	-cp -f $(SCRIPTS) $(PREFIX)$(DATADIR)
-	-cp -f $(MANPAGE) $(PREFIX)$(MANDIR)
-	-test $(PREFIX)$(BINDIR)/amap6 || cd $(PREFIX)$(BINDIR) && ln -s amap amap6
+	@echo Installing to $(DESTDIR), change this by running ./configure --prefix=path
+	-mkdir -vp $(DESTDIR)$(BINDIR) 2> /dev/null
+	-mkdir -vp $(DESTDIR)$(DATADIR) 2> /dev/null
+	-mkdir -vp $(DESTDIR)$(MANDIR) 2> /dev/null
+	-test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(BINDIR)
+	-test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(BINDIR) || echo
+	-cp -f $(SCRIPTS) $(DESTDIR)$(DATADIR)
+	-cp -f $(MANPAGE) $(DESTDIR)$(MANDIR)
+	-test $(DESTDIR)$(BINDIR)/amap6 || cd $(DESTDIR)$(BINDIR) && ln -s amap amap6
 
 clean:	
 	cd pcre-3.9 && make clean
Index: amap-lib.c
===================================================================
--- amap-lib.c.orig	2005-09-07 23:22:24.000000000 +0200
+++ amap-lib.c	2009-03-21 00:52:48.000000000 +0100
@@ -306,7 +306,7 @@ FILE *amap_open_file(char *fnam, char *t
       strcpy(file_name, AMAP_PREFIX);
       if (file_name[strlen(file_name) - 1] != '/')
         strcat(file_name, "/");
-      strcat(file_name, "etc/");
+      strcat(file_name, "usr/share/amap/");
       strcat(file_name, AMAP_DEFAULT_FILENAME);
       strcat(file_name, extension);
       f = fopen(file_name, "r");
Index: amap.h
===================================================================
--- amap.h.orig	2005-09-08 00:08:57.000000000 +0200
+++ amap.h	2009-03-21 00:55:51.000000000 +0100
@@ -29,7 +29,7 @@
   #warning "PREFIX definition found, installing to this prefix directory location"
   #define AMAP_PREFIX         PREFIX
  #else
-  #define AMAP_PREFIX         "/usr/local"
+  #define AMAP_PREFIX         "/"
  #endif
 #endif
openSUSE Build Service is sponsored by