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

[rousseau@quantz.debian.org]

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

Modified Files:
	Makefile.am 
Log Message:
honor DESTDIR in install rules (closes [ #300110 ])


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	10 Sep 2003 08:47:41 -0000	1.1
+++ Makefile.am	16 Sep 2003 14:18:42 -0000	1.2
@@ -3,7 +3,7 @@
 CCID_BUNDLE = ifd-ccid.bundle
 CCID_LIB = libccid.$(DYN_LIB_EXT)
 CCIDTWIN_LIB = libccidtwin.$(DYN_LIB_EXT)
-CCIDFTWIN_PATH = $(prefix)/lib/pcsc/drivers/serial
+CCIDFTWIN_PATH = $(prefix)/pcsc/drivers/serial
 
 lib_LTLIBRARIES = libccid.la libccidtwin.la
 bin_PROGRAMS = parse
@@ -38,21 +38,26 @@
 	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
-	mkdir -p $(usbdropdir)
-	cp -r $(CCID_BUNDLE) $(usbdropdir)
+	$(mkinstalldirs) $(DESTDIR)$(usbdropdir)
+	cp -r $(CCID_BUNDLE) $(DESTDIR)$(usbdropdir)
 
 install_ccidtwin: libccidtwin.la
 	perl -ne "s|TARGET|$(CCIDFTWIN_PATH)/$(CCIDTWIN_LIB).$(VERSION)| ; print" $(srcdir)/reader.conf.in > reader.conf
-	mkdir -p $(CCIDFTWIN_PATH)
-	cp .libs/$(CCIDTWIN_LIB) $(CCIDFTWIN_PATH)/$(CCIDTWIN_LIB).$(VERSION)
-	@echo "copy src/reader.conf in /etc/ or edit /etc/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" ; \
+	else \
+		$(mkinstalldirs) $(DESTDIR)/etc ; \
+		cp reader.conf $(DESTDIR)/etc/ ; \
+	fi
 
 uninstall: uninstall_ccid uninstall_ccidtwin
 
 uninstall_ccid:
-	rm -f $(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)
-	rm -f $(usbdropdir)/$(CCID_BUNDLE)/Contents/Info.plist
+	rm -f $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)
 
 uninstall_ccidtwin:
-	rm -f $(CCIDFTWIN_PATH)/$(CCIDTWIN_LIB).$(VERSION)
+	rm -f $(DESTDIR)$(CCIDFTWIN_PATH)/$(CCIDTWIN_LIB).$(VERSION)