SOURCES: herrie-makefile.patch - adapted for 1.3 version

[lisu]

Author: lisu                         Date: Mon Jan 22 22:46:32 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adapted for 1.3 version

---- Files affected:
SOURCES:
   herrie-makefile.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/herrie-makefile.patch
diff -u SOURCES/herrie-makefile.patch:1.5 SOURCES/herrie-makefile.patch:1.6
--- SOURCES/herrie-makefile.patch:1.5	Tue Jan  2 00:39:46 2007
+++ SOURCES/herrie-makefile.patch	Mon Jan 22 23:46:27 2007
@@ -1,38 +1,29 @@
---- herrie-1.2/GNUmakefile~	2007-01-01 16:28:38.000000000 +0100
-+++ herrie-1.2/GNUmakefile	2007-01-02 00:26:38.000000000 +0100
-@@ -26,7 +26,7 @@
- 
- VERSION=	1.2
- 
--PREFIX?=	/usr/local
-+PREFIX?=	/usr
- OS:=		$(shell uname)
- MANDIR=		$(PREFIX)/share/man
- TRANSDIR=	$(PREFIX)/share/locale
-@@ -118,6 +118,8 @@
+--- herrie-1.3/GNUmakefile~	2007-01-22 23:40:35.000000000 +0100
++++ herrie-1.3/GNUmakefile	2007-01-22 23:43:39.000000000 +0100
+@@ -137,6 +137,8 @@
  endif
  endif
  
-+CFLAGS+=       $(OPTFLAGS)
++CFLAGS+=	$(OPTFLAGS)
 +
- # libao dies with -Wstrict-prototypes - fixed in trunk
- CFLAGS+=	$(shell pkg-config --cflags glib-2.0 gthread-2.0) \
- 		-I$(PREFIX)/include -DAUDIO_OUTPUT=\"$(AUDIO_OUTPUT)\" \
-@@ -136,13 +138,13 @@
- all: herrie$(BINARY_EXT) herrie.1 $(LOCALES:%=%.mo)
+ OBJS+=		audio_file.o audio_output_$(AUDIO_OUTPUT).o config.o \
+ 		gui_browser.o gui_draw.o gui_input.o gui_msgbar.o \
+ 		gui_playq.o gui_vfslist.o main.o playq.o vfs.o \
+@@ -154,13 +156,13 @@
+ all: $(APP_NAME) $(APP_NAME).1.gz $(LOCALES:%=%.mo)
  
  install: all
--	install -s herrie$(BINARY_EXT) $(PREFIX)/bin/herrie$(BINARY_EXT)
--	install -m 444 herrie.1 $(MANDIR)/man1/herrie.1
-+	install -s herrie$(BINARY_EXT) $(DESTDIR)$(PREFIX)/bin/herrie$(BINARY_EXT)
-+	install -m 444 herrie.1 $(DESTDIR)$(MANDIR)/man1/herrie.1
+-	install -s $(APP_NAME) $(PREFIX)/bin/$(APP_NAME)$(BINARY_EXT)
+-	install -m 444 $(APP_NAME).1.gz $(MANDIR)/man1/
++	install -s $(APP_NAME) $(DESTDIR)$(PREFIX)/bin/$(APP_NAME)$(BINARY_EXT)
++	install -m 444 $(APP_NAME).1.gz $(DESTDIR)$(MANDIR)/man1/
  	$(foreach lang,$(LOCALES), \
 -		mkdir -p $(TRANSDIR)/$(lang)/LC_MESSAGES)
 +		mkdir -p $(DESTDIR)$(TRANSDIR)/$(lang)/LC_MESSAGES)
  	$(foreach lang,$(LOCALES), \
  		install -m 444 $(lang).mo \
--		    $(TRANSDIR)/$(lang)/LC_MESSAGES/herrie.mo)
-+		    $(DESTDIR)$(TRANSDIR)/$(lang)/LC_MESSAGES/herrie.mo)
+-		    $(TRANSDIR)/$(lang)/LC_MESSAGES/$(APP_NAME).mo)
++		    $(DESTDIR)$(TRANSDIR)/$(lang)/LC_MESSAGES/$(APP_NAME).mo)
  
  clean:
- 	rm -f herrie$(BINARY_EXT) *.o *.mo *.core
+ 	rm -f *.core *.mo *.o .gdb_history
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/herrie-makefile.patch?r1=1.5&r2=1.6&f=u