[Linuxconsole-commit] SF.net SVN: linuxconsole:[2414] trunk

[<sk...@us...>]

Revision: 2414
          http://linuxconsole.svn.sourceforge.net/linuxconsole/?rev=2414&view=rev
Author:   skitt
Date:     2011-04-03 21:32:12 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Describe the installation process.
Drop mentions of acceltest and GPL-1.
Credit Jean Delvare for his improvements to inputattach.
Add distclean target.
Make the install target create the bin directory.
Add top-level Makefile.

Modified Paths:
--------------
    trunk/README
    trunk/utils/Makefile

Added Paths:
-----------
    trunk/Makefile

Added: trunk/Makefile
===================================================================
--- trunk/Makefile	                        (rev 0)
+++ trunk/Makefile	2011-04-03 21:32:12 UTC (rev 2414)
@@ -0,0 +1,23 @@
+# $Id: Makefile 2413 2011-04-03 17:24:32Z skitt $
+#
+# Makefile for Linux input utilities
+#
+# © 2011 Stephen Kitt <st...@sk...>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
+
+%:
+	$(MAKE) -C utils $@

Modified: trunk/README
===================================================================
--- trunk/README	2011-04-03 17:24:32 UTC (rev 2413)
+++ trunk/README	2011-04-03 21:32:12 UTC (rev 2414)
@@ -34,6 +34,20 @@
 4. Store the device's setup using jscal-store.
 
 
+Installation
+------------
+
+To install the utilities and their manpages, run
+	make install
+from the distribution's top directory. This will install everything
+into /usr/local. Should you wish to install the tools elsewhere, you
+can use the PREFIX variable:
+	PREFIX=/usr make install
+The Makefiles also recognise the DESTDIR variable which can be used to
+install into a temporary directory (this is useful mainly for
+distribution packagers).
+
+
 Auto-loading inputattach and jscal-restore
 ------------------------------------------
 
@@ -102,6 +116,7 @@
 * Alexander Clouter: W8001 support.
 * Roberto Neri: much discussion, and fixes and improvements to
   jscal-store/jscal-restore and the udev rules given above.
+* Jean Delvare: inputattach improvements, TAOS support.
 
 
 License
@@ -119,8 +134,7 @@
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version. (acceltest.c is provided only under
-the terms of version 1 of the License.)
+your option) any later version.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -133,5 +147,5 @@
 USA.
 
 
-The GNU General Public License version 1 is provided in the COPYING-1
-file; version 2 is provided in the COPYING file.
+The GNU General Public License version 2 is provided in the COPYING
+file.

Modified: trunk/utils/Makefile
===================================================================
--- trunk/utils/Makefile	2011-04-03 17:24:32 UTC (rev 2413)
+++ trunk/utils/Makefile	2011-04-03 21:32:12 UTC (rev 2414)
@@ -35,6 +35,7 @@
 
 compile: $(PROGRAMS)
 
+distclean: clean
 clean:
 	$(RM) *.o *.swp $(PROGRAMS) *.orig *.rej map *~
 
@@ -68,8 +69,10 @@
 	sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@
 
 install: compile
+	install -d $(DESTDIR)$(PREFIX)/bin
 	install $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin
 	install -d $(DESTDIR)$(PREFIX)/share/joystick
 	install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick
 
-.PHONY: compile clean install
+.PHONY: compile clean distclean install
+ 
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.