[Pcsclite-cvs-commit] Drivers/ccid/src Makefile.am,1.2,1.3

[rousseau@quantz.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory quantz:/tmp/cvs-serv19088/src

Modified Files:
	Makefile.am 
Log Message:
modify install rules so that root can use them even over NFS where root is
nobody


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	16 Sep 2003 14:18:42 -0000	1.2
+++ Makefile.am	22 Sep 2003 14:22:51 -0000	1.3
@@ -35,22 +35,19 @@
 install: install_ccid install_ccidtwin
 
 install_ccid: libccid.la
-	mkdir -p $(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/
-	cp .libs/$(CCID_LIB) $(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB).$(VERSION)
-	sed s/VERSION/$(VERSION)/ $(srcdir)/Info.plist | sed s/TARGET/$(CCID_LIB)/ > $(CCID_BUNDLE)/Contents/Info.plist
-	$(mkinstalldirs) $(DESTDIR)$(usbdropdir)
-	cp -r $(CCID_BUNDLE) $(DESTDIR)$(usbdropdir)
+	$(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/
+	cp .libs/$(CCID_LIB) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB).$(VERSION)
+	sed s/VERSION/$(VERSION)/ $(srcdir)/Info.plist | sed s/TARGET/$(CCID_LIB)/ > $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/Info.plist
 
 install_ccidtwin: libccidtwin.la
-	perl -ne "s|TARGET|$(CCIDFTWIN_PATH)/$(CCIDTWIN_LIB).$(VERSION)| ; print" $(srcdir)/reader.conf.in > reader.conf
 	$(mkinstalldirs) $(DESTDIR)$(CCIDFTWIN_PATH)
 	cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(CCIDFTWIN_PATH)/$(CCIDTWIN_LIB).$(VERSION)
 	if [ -e $(DESTDIR)/etc/reader.conf ] ; \
 	then \
-		@echo "Edit existing /etc/reader.conf" ; \
+		echo "Edit existing /etc/reader.conf" ; \
 	else \
 		$(mkinstalldirs) $(DESTDIR)/etc ; \
-		cp reader.conf $(DESTDIR)/etc/ ; \
+		perl -ne "s|TARGET|$(CCIDFTWIN_PATH)/$(CCIDTWIN_LIB).$(VERSION)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/etc/reader.conf ; \
 	fi
 
 uninstall: uninstall_ccid uninstall_ccidtwin