SOURCES: pmount-build_fixes.patch - updated for 0.9.7

[freetz]

Author: freetz                       Date: Mon Feb 27 15:31:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.9.7

---- Files affected:
SOURCES:
   pmount-build_fixes.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/pmount-build_fixes.patch
diff -u SOURCES/pmount-build_fixes.patch:1.2 SOURCES/pmount-build_fixes.patch:1.3
--- SOURCES/pmount-build_fixes.patch:1.2	Fri Nov 25 16:57:25 2005
+++ SOURCES/pmount-build_fixes.patch	Mon Feb 27 16:31:00 2006
@@ -1,40 +1,14 @@
-diff -aurN pmount-0.9.3.orig/Makefile pmount-0.9.3/Makefile
---- pmount-0.9.3.orig/Makefile	2005-06-27 15:16:23.000000000 +0200
-+++ pmount-0.9.3/Makefile	2005-08-02 15:06:57.000000000 +0200
-@@ -1,5 +1,5 @@
- LIBS=-lsysfs
--CFLAGS?=-Wall -W -O2
-+CFLAGS?=-Wall -W $(OPTFLAGS)
- HAL_CFLAGS=$(shell pkg-config hal --cflags)
- HAL_LDFLAGS=$(shell pkg-config hal --libs)
- VERSION=$(shell head -n 1 CHANGES)
-@@ -24,13 +24,13 @@
- 	$(CC) $(LDFLAGS) $(HAL_LDFLAGS) $^ $(LIBS) -o $@
+diff -aurN pmount-0.9.7.orig/src/Makefile.am pmount-0.9.7/src/Makefile.am
+--- pmount-0.9.7.orig/src/Makefile.am	2005-12-16 11:34:37.000000000 +0100
++++ pmount-0.9.7/src/Makefile.am	2006-02-27 16:23:03.876543872 +0100
+@@ -30,8 +30,8 @@
  
- install: all install-mo
--	install -o root -g root -m 4755 -D ./pmount $(DESTDIR)/$(PREFIX)/bin/pmount
--	install -o root -g root -m 4755 -D ./pumount $(DESTDIR)/$(PREFIX)/bin/pumount
--	install -o root -g root -m 755 -D ./pmount-hal $(DESTDIR)/$(PREFIX)/bin/pmount-hal
--	install -o root -g root -m 644 -D ./pmount.1 $(DESTDIR)/$(PREFIX)/share/man/man1/pmount.1
--	install -o root -g root -m 644 -D ./pumount.1 $(DESTDIR)/$(PREFIX)/share/man/man1/pumount.1
--	install -o root -g root -m 644 -D ./pmount-hal.1 $(DESTDIR)/$(PREFIX)/share/man/man1/pmount-hal.1
--	install -o root -g root -m 644 -D ./pmount.allow $(DESTDIR)/etc/pmount.allow
-+	install -D ./pmount $(DESTDIR)/$(bindir)/pmount
-+	install -D ./pumount $(DESTDIR)/$(bindir)/pumount
-+	install -D ./pmount-hal $(DESTDIR)/$(bindir)/pmount-hal
-+	install -D ./pmount.1 $(DESTDIR)/$(datadir)/man/man1/pmount.1
-+	install -D ./pumount.1 $(DESTDIR)/$(datadir)/man/man1/pumount.1
-+	install -D ./pmount-hal.1 $(DESTDIR)/$(datadir)/man/man1/pmount-hal.1
-+	install -D ./pmount.allow $(DESTDIR)/$(sysconfdir)/pmount.allow
- 
- uninstall: uninstall-mo
- 	rm -f $(DESTDIR)/$(PREFIX)/bin/pmount $(DESTDIR)/$(PREFIX)/bin/pumount $(DESTDIR)/$(PREFIX)/bin/pmount-hal
-@@ -38,7 +38,7 @@
- 	rm -f $(DESTDIR)/$(PREFIX)/share/man/man1/pmount-hal.1
- 
- install-mo:
--	for f in po/*.po; do P="$(DESTDIR)/$(PREFIX)/share/locale/$$(basename $${f%.po})/LC_MESSAGES/"; mkdir -p "$$P"; msgfmt -o "$$P/pmount.mo" $$f; done
-+	for f in po/*.po; do P="$(DESTDIR)/$(datadir)/locale/$$(basename $${f%.po})/LC_MESSAGES/"; mkdir -p "$$P"; msgfmt -o "$$P/pmount.mo" $$f; done
- 
- uninstall-mo:
- 	for f in po/*.po; do P="$(DESTDIR)/$(PREFIX)/share/locale/$$(basename $${f%.po})/LC_MESSAGES/"; rm -f "$$P/pmount.mo"; rmdir -p --ignore-fail-on-non-empty "$$P"; done
+ install-data-hook:
+ 	test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR)
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
++	$(INSTALL_DATA) -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
++	$(INSTALL_DATA) -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
+ 	
+ uninstall-hook:
+ 	rm -f $(INSTALL_DIR)/pmount
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pmount-build_fixes.patch?r1=1.2&r2=1.3&f=u