X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=Makefile;h=e0c65202acddd0e0e6e1d64762c726dca0ac8d72;hp=bdb6b549c2b580702ed7cef89d137e118e76e9b6;hb=HEAD;hpb=ff16d95f7b8eaa9b42866a705ee525238faa8a38

diff --git a/Makefile b/Makefile
index bdb6b54..e0c6520 100644
--- a/Makefile
+++ b/Makefile
@@ -42,12 +42,13 @@ package: $(OBJ)
 
 	mkdir -p $(BUILD_PATH)/generic
 	cp $(SOURCE_PATH)/constants.py  $(BUILD_PATH)/generic
-	$(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
-	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
+	$(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+	cp $(SOURCE_PATH)/telepathy-theonering $(BUILD_PATH)/generic/
 	cp support/$(PROJECT_NAME).manager $(BUILD_PATH)/generic
 	cp support/$(PROJECT_NAME).profile.* $(BUILD_PATH)/generic
 	cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service $(BUILD_PATH)/generic
-	cp support/icons/*-$(PROJECT_NAME).png $(BUILD_PATH)/generic/
+	cp support/icons/*-tor_*.png $(BUILD_PATH)/generic/
 	cp support/builddeb.py $(BUILD_PATH)/generic
 	cp support/py2deb.py $(BUILD_PATH)/generic
 	cp support/fake_py2deb.py $(BUILD_PATH)/generic
@@ -58,9 +59,6 @@ package: $(OBJ)
 	mkdir -p $(BUILD_PATH)/fremantle
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/fremantle
 	cd $(BUILD_PATH)/fremantle ; python builddeb.py fremantle
-	mkdir -p $(BUILD_PATH)/mer
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
-	cd $(BUILD_PATH)/mer ; python builddeb.py mer
 	mkdir -p $(BUILD_PATH)/debian
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
 	cd $(BUILD_PATH)/debian ; python builddeb.py debian