Changeset 317 for trunk

Timestamp:

08/05/09 23:28:35 (3 years ago)

Author:

marc

Message:

Improved makefile to work with prefixes, fixed errors, improved manpag and readme, and fix a configuration error

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Makefile (modified) (4 diffs)
• README (modified) (1 diff)
• config.py (modified) (2 diffs)
• share/itaka.1 (modified) (1 diff)

trunk/ChangeLog

@@ -13 +13 @@
 0.2.2:
  * Fixed a fatal bug with Python 2.6/PyGTK 2.14
- * Simplified and improved Makefile
  * Fixed an issue with the right images showing up in notifications
+ * Fixed an fatal issue with starting Itaka from unexistant directories
+ * Vastly improved Makefile to support installation on different PREFIX
 
 0.2.1:

trunk/Makefile

@@ -6 +6 @@
 FIND ?= find
 
-PREFIX = /usr
+PREFIX = /usr/local
 # When debian builds it, it passes its own DESTDIR
 DESTDIR = $(PREFIX)
@@ -29 +29 @@
         mv config.py config.py.old
         mv itaka.py itaka.py.old
-        sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py
-        sed -e "s|/usr/share/locale/|$(REPLACELOCALEDIR)|g" itaka.py.old > itaka.py
-        mv config.py.old config.py
-        mv itaka.py.old itaka.py
+        sed "s|/usr/local/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py
+        sed "s|/usr/share/locale/|$(REPLACELOCALEDIR)|g" itaka.py.old > itaka.py
         
         $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR)
@@ -52 +50 @@
         $(INSTALL) -m 644 share/itaka.1.gz $(MANDIR)
         if test -f $(BINDIR)/itaka; then rm $(BINDIR)/itaka; fi 
+
+        # Create our binary directory for the symlink
+        if test ! -d $(BINDIR); then mkdir $(BINDIR); fi
         ln -sf  $(LIBDIR)/itaka.py $(BINDIR)/itaka
-        echo $( ls $(BINDIR)/itaka )
+
+        #echo $( ls $(BINDIR)/itaka )
         chmod +x $(BINDIR)/itaka
         
@@ -64 +66 @@
         done
 
+        # Clean up
+        mv config.py.old config.py
+        mv itaka.py.old itaka.py
+
 uninstall:
         rm -r $(BINDIR)/itaka $(DATADIR) $(LIBDIR) $(ICONDIR)/itaka.png $(APPLICATIONSDIR)/itaka.desktop $(MANDIR)/itaka.1.gz
 
 clean:
-        find . -type f  \( -regex '.+\.py[co]' -o -name 'itaka.1.gz' \) -exec rm {} \;
+        find . -type f  \( -regex '.+\.py[co]' -o -name 'itaka.1.gz' \) -exec rm -f {} \;
         rm locale/*/LC_MESSAGES/*.mo
 

trunk/README

@@ -35 +35 @@
 Makefile will copy the files to the correct location in your system. You do not 
 need to configure or compile Itaka as it is written in interpreted Python code.
+
+By default itaka will be installed in /usr/local/, if you want to use another location, add PREFIX=/usr/mylocation before every make command, including unnstall.
 
 To uninstall, once again as root type 'make uninstall'

trunk/config.py

@@ -58 +58 @@
 
 #: To be changed on install to specify where the installed files actually are
-image_prefix = '/usr/share/itaka/images/'
+image_prefix = '/usr/local/share/itaka/images/'
 if os.path.exists(image_prefix):
     image_dir = image_prefix
@@ -67 +67 @@
 
 #: Save path for screenshots (system-specific specified later on)
-save_path = os.getcwd()
+try:
+    save_path = os.getcwd()
+except:
+    print "[*] WARNING: Could not get current directory"
 
 """ Console output verbosity

trunk/share/itaka.1

@@ -26 +26 @@
 .SH "SEE ALSO" 
 .PP 
-/usr/share/doc/itaka/README.gz
+README file in source or on Debian systems: /usr/share/doc/itaka/README.gz
 .SH "AUTHOR" 
 .PP 
 Itaka was written by: Marc E. <santusmarc@users.sf.net>
 .PP 
-This manual page was written by Marc E. santusmarc@users.sf.net for 
+This manual page was written by Marc E. <santusmarc@users.sourceforge.net> for 
 the \fBDebian\fP system (but may be used by others).  Permission is 
 granted to copy, distribute and/or modify this document under