Changeset 306 for branches/release/0.2/Makefile

Timestamp:

08/03/09 10:11:39 (3 years ago)

Author:

marc

Message:

Fixed Menu, improved makefile (backported from trunk), don't install so many images

File:

• branches/release/0.2/Makefile (modified) (3 diffs)

branches/release/0.2/Makefile

@@ -6 +6 @@
 FIND ?= find
 
-# autodetect GNOME prefix, change this if you want it elsewhere
-#PREFIX ?= `pkg-config libgnome-2.0 --variable=prefix || echo /usr`
 PREFIX = /usr
+# When debian builds it, it passes its own DESTDIR
 DESTDIR = $(PREFIX)
 
@@ -15 +14 @@
 DATADIR = $(DESTDIR)/share/itaka
 IMAGESDIR = $(DATADIR)/images
-# For debian compatibility
-REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images
 APPLICATIONSDIR = $(DESTDIR)/share/applications
 ICONDIR = $(DESTDIR)/share/pixmaps
 MANDIR = $(DESTDIR)/share/man/man1
 
+# For debian compatibility, these are hardcoded
+REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images/
+
 PYFILES := $(shell $(FIND) . -name "*.py" -print)
 
 install: 
+        # Replace images directory
         mv config.py config.py.old
         sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py
+        mv config.py.old config.py
+
+        gzip -9 -c share/itaka.1 > share/itaka.1.gz
+
         $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR)
         $(INSTALL) -m 755 *.py $(LIBDIR)
-        $(INSTALL) -m 644 share/images/* $(IMAGESDIR)
-        $(INSTALL) -m 644 share/images/itaka.png $(ICONDIR)
+
+        # We only need a few images
+        $(INSTALL) -m 644 share/images/itaka.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka-take.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka16x16-take.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka64x64.png $(IMAGESDIR)
+
+        ln -sf $(IMAGESDIR)/itaka.png $(ICONDIR)/itaka.png
+
         $(INSTALL) -m 644 share/itaka.desktop $(APPLICATIONSDIR)
-        gzip -9 -c share/itaka.1 > share/itaka.1.gz
         $(INSTALL) -m 644 share/itaka.1.gz $(MANDIR)
         if test -f $(BINDIR)/itaka; then rm $(BINDIR)/itaka; fi 
@@ -37 +48 @@
         echo $( ls $(BINDIR)/itaka )
         chmod +x $(BINDIR)/itaka
-        mv config.py.old config.py
-        rm share/itaka.1.gz
+        
 uninstall:
         rm -r $(BINDIR)/itaka $(DATADIR) $(LIBDIR) $(ICONDIR)/itaka.png $(APPLICATIONSDIR)/itaka.desktop $(MANDIR)/itaka.1.gz
+
+clean:
+        find . -name '*.pyc' -o -name '*.pyo' -exec rm {} \;
+        rm share/itaka.1.gz
+
+help:
+        @echo Usage:
+        @echo make install              - install binaries into the official directories
+        @echo make clean                - delete built modules and object files
+        @echo make uninstall            - uninstall binaries from the official directories
+        @echo make help                 - prints this help
+        @echo
+