fixed merge

diff --cc Makefile
index 14ca887,20b0c31..2a6232f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -18,19 -18,19 +18,24 @@@ all
  widget:
        zip -r $(PKG_NAME).wgt $(FILES) assets
  
 +install_widget:
 +      @echo "installing wgt widget file"
 +      mkdir -p $(INSTALL_DIR)/
 +      cp $(PKG_NAME).wgt $(INSTALL_DIR)/
 +
  install:
+       @echo "installing wgt widget file"
        mkdir -p $(INSTALL_DIR)/
-       cp -a assets $(INSTALL_DIR)/
-       cp $(FILES) $(INSTALL_DIR)/
-       mkdir -p $(DESKTOP_DIR)/
-       cp $(PROJECT).desktop $(DESKTOP_DIR)/
-       mkdir -p $(ICON_DIR)/
-       cp $(PROJECT).png $(ICON_DIR)/$(PROJECT).png
+       cp $(PKG_NAME).wgt $(INSTALL_DIR)/
+ 
+ #install:
+ #     mkdir -p $(INSTALL_DIR)/
+ #     cp -a assets $(INSTALL_DIR)/
+ #     cp $(FILES) $(INSTALL_DIR)/
+ #     mkdir -p $(DESKTOP_DIR)/
+ #     cp $(PROJECT).desktop $(DESKTOP_DIR)/
+ #     mkdir -p $(ICON_DIR)/
+ #     cp $(PROJECT).png $(ICON_DIR)/$(PROJECT).png
  
  spec: 
        specify $<