SOURCES: snownews-FHS.patch - partially applied upstream

[pawelz]

Author: pawelz                       Date: Thu Sep  4 12:46:32 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- partially applied upstream

---- Files affected:
SOURCES:
   snownews-FHS.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/snownews-FHS.patch
diff -u SOURCES/snownews-FHS.patch:1.4 SOURCES/snownews-FHS.patch:1.5
--- SOURCES/snownews-FHS.patch:1.4	Sat Dec 23 21:23:58 2006
+++ SOURCES/snownews-FHS.patch	Thu Sep  4 14:46:27 2008
@@ -1,15 +1,14 @@
---- snownews-1.5.7.original/Makefile	2005-06-05 11:50:22.000000000 +0200
-+++ snownews-1.5.7/Makefile	2005-09-03 20:06:30.000000000 +0200
-@@ -2,6 +2,8 @@
- MAKE=       make
+--- snownews-1.5.10/Makefile	2008-09-01 16:50:37.000000000 +0200
++++ snownews-1.5.10.b/Makefile	2008-09-01 16:44:24.000000000 +0200
+@@ -3,6 +3,7 @@
  INSTALL=    install
  LOCALEPATH= $(PREFIX)/share/locale
+ MANPATH=    $(PREFIX)/share/man
 +BINDIR=     $(PREFIX)/bin
-+MANDIR=     $(PREFIX)/share/man
  
  ### Compiler/linker flags   ###
  ### Generated via configure ###
-@@ -56,15 +58,15 @@
+@@ -57,13 +58,13 @@
  	@echo ""
  
  install-bin: snownews
@@ -21,39 +20,11 @@
 -	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
 -	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
 -	if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \
--		ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \
-+	$(INSTALL) snownews $(DESTDIR)$(BINDIR)
+-		(cd $(DESTDIR)$(PREFIX)/bin && \
++	$(INSTALL) -s snownews $(DESTDIR)$(BINDIR)
 +	$(INSTALL) opml2snow $(DESTDIR)$(BINDIR)
 +	if [ ! -f "$(DESTDIR)$(BINDIR)/snow2opml" ]; then \
-+		ln -sf opml2snow $(DESTDIR)$(BINDIR)/snow2opml; \
++		(cd $(DESTDIR)$(BINDIR) && \
+ 		 ln -sf opml2snow snow2opml ); \
  	fi;
--	$(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin
-+	$(INSTALL) snowsync $(DESTDIR)$(BINDIR)
  
- install-locales: locales
- 	for L in $(LOCALES); do \
-@@ -75,17 +77,17 @@
- 	done
- 
- install-man: manpages
--	if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \
--		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
-+	if [ ! -d "$(DESTDIR)$(MANDIR)/man1" ]; then \
-+		mkdir -p $(DESTDIR)$(MANDIR)/man1; \
- 	fi
--	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
--	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
-+	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(MANDIR)/man1
- 	
- 	for L in $(LANGS); do \
--		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
--			mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \
-+		if [ ! -d "$(DESTDIR)$(MANDIR)/$$L/man1" ]; then \
-+			mkdir -p $(DESTDIR)$(MANDIR)/$$L/man1; \
- 		fi; \
--		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/man/$$L/man1; \
-+		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(MANDIR)/$$L/man1; \
- 	done
- 
- ### Cleanup ###
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/snownews-FHS.patch?r1=1.4&r2=1.5&f=u