[Wxdevcenter-cvs] wxDevCenter GNUmakefile,1.6,1.7

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/wxDevCenter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16388

Modified Files:
	GNUmakefile 
Log Message:
Fix bakefile rules for install freedesktop shortcut.

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GNUmakefile	23 Aug 2005 11:42:30 -0000	1.6
--- GNUmakefile	23 Aug 2005 12:31:34 -0000	1.7
***************
*** 128,135 ****
  endif
  ifeq ($(BUILD),debug)
! FREEDESKTOP_MENU_FILE = data/wxdevcenterd.desktop
  endif
  ifeq ($(BUILD),release)
! FREEDESKTOP_MENU_FILE = data/wxdevcenter.desktop
  endif
  ifeq ($(BUILD),debug)
--- 128,135 ----
  endif
  ifeq ($(BUILD),debug)
! FREEDESKTOP_MENU_FILE = wxdevcenterd.desktop
  endif
  ifeq ($(BUILD),release)
! FREEDESKTOP_MENU_FILE = wxdevcenter.desktop
  endif
  ifeq ($(BUILD),debug)
***************
*** 170,174 ****
  all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX)
  
! install: all install_wxDevCenterLib install_wxDevCenter $(prefix)/share/applications/wxdevcenter.desktop
  	$(INSTALL) -d $(prefix)/include
  	for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \
--- 170,174 ----
  all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX)
  
! install: all install_wxDevCenterLib install_wxDevCenter
  	$(INSTALL) -d $(prefix)/include
  	for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \
***************
*** 185,188 ****
--- 185,192 ----
  	$(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \
  	done
+ 	$(INSTALL) -d $(prefix)/share/applications
+ 	(cd data/ ; $(INSTALL) -m 644  $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications)
+ 	$(INSTALL) -d $(prefix)/share/pixmaps
+ 	(cd data/img/ ; $(INSTALL) -m 644  wxDevCenter.png $(prefix)/share/pixmaps)
  
  uninstall: 
***************
*** 216,225 ****
  	install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin
  
- $(prefix)/share/applications/wxdevcenter.desktop: $(FREEDESKTOP_MENU_FILE) $(prefix)/share/pixmaps/wxDevCenter.png
- 	cp -pf $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications/wxdevcenter.desktop
- 
- $(prefix)/share/pixmaps/wxDevCenter.png: data/img/wxDevCenter.png
- 	cp -pf data/img/wxDevCenter.png $(prefix)/share/pixmaps/wxDevCenter.png
- 
  ./build/$(BUILD)/specific_Config.o: ./src/unix/Config.cpp
  	$(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $<
--- 220,223 ----