[Pcsclite-cvs-commit] XCardII Makefile,1.2,1.3 README,1.5,1.6

rousseau@quantz.debian.org rousseau@quantz.debian.org
Sat, 11 Oct 2003 22:00:17 +0200


Update of /cvsroot/muscleapps/XCardII
In directory quantz:/tmp/cvs-serv27828

Modified Files:
	Makefile README 
Log Message:
move definition of DESTDIR from src/Makefile to Makefile and also
install the manpage. Thanks to Damien Sauveron for the patch.


Index: Makefile
===================================================================
RCS file: /cvsroot/muscleapps/XCardII/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	25 Jun 2003 18:41:25 -0000	1.2
+++ Makefile	11 Oct 2003 20:00:14 -0000	1.3
@@ -1,5 +1,15 @@
+# by default install in /usr/local
+ifeq ($(DESTDIR),)
+DESTDIR=/usr/local
+endif
+
 all:
 	$(MAKE) -C src all
+
+install:
+	DESTDIR=$(DESTDIR) $(MAKE) -C src install
+	install -d $(DESTDIR)/man/man1
+	install -m 0644 man/xcard.1 $(DESTDIR)/man/man1
 
 clean distclean:
 	$(MAKE) -C src clean

Index: README
===================================================================
RCS file: /cvsroot/muscleapps/XCardII/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README	30 Sep 2003 20:46:46 -0000	1.5
+++ README	11 Oct 2003 20:00:14 -0000	1.6
@@ -3,13 +3,14 @@
 Platforms : Linux, Solaris, HP-UX, Mac OS X, Windows 2000
 Requires  : QT libraries/moc (2.2 or higher)
             pcsc-lite-1.1.0 or higher
-	    smartcard plugin
+            smartcard plugin
 
-installation:
-Go into the src/ directory and type:
-make install
+installation (by default in /usr/local/):
+$ make install
 
-If the build fails, edit the Makefile to make sure that you have moc
+You can change the default location by editing Makefile.
+
+If the build fails, edit the src/Makefile to make sure that you have moc
 installed and that it is pointing to to the right location.  Also, make
 sure that the QT libraries are installed and it is pointing to those.