Fixing some more build issues

git-svn-id: file:///svnroot/ejpi/trunk@13 df6cc7de-23d0-4ae0-bb86-c17aa67b2a9d

diff --git a/Makefile b/Makefile
index 4fd8b54..c74571f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 PROJECT_NAME=ejpi
 SOURCE_PATH=src
 SOURCE=$(shell find $(SOURCE_PATH) -iname *.py)
-DATA=$(shell find $(SOURCE_PATH) -iname *.ini) $(shell find $(SOURCE_PATH) -iname *.map)
+DATA_TYPES=*.ini *.map *.glade *.png
+DATA=$(foreach type, $(DATA_TYPES), $(shell find $(SOURCE_PATH) -iname $(type)))
 OBJ=$(SOURCE:.py=.pyc)
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags
 BUILD_PATH=./build/
@@ -35,7 +36,6 @@ package:
        rm -Rf $(BUILD_PATH)
        mkdir $(BUILD_PATH)
        cp $(SOURCE_PATH)/$(PROJECT_NAME).py  $(BUILD_PATH)
-       cp $(SOURCE_PATH)/$(PROJECT_NAME).glade  $(BUILD_PATH)
        $(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
        $(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
        cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)

diff --git a/support/builddeb.py b/support/builddeb.py
index d3930e9..c4fe9b0 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -8,7 +8,7 @@ __description__ = "RPN Calculator"
 __author__ = "Ed Page"
 __email__ = "eopage@byu.net"
 __version__ = "0.9.0"
-__build__ = 2
+__build__ = 4
 __changelog__ = '''\
 0.9.0 - "Feed is for horses, so what about feedback?"
 * Initial public release
@@ -76,7 +76,6 @@ if __name__ == "__main__":
                        for (oldName, newName) in files
                )
        p["/usr/share/applications/hildon"] = ["ejpi.desktop"]
-       p["/usr/lib/ejpi"] = ["gc_dialer.glade"]
        # p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-dialcentral.png|dialcentral.png"]
        # p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-dialcentral.png|dialcentral.png"]
        # p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-dialcentral.png|dialcentral.png"]