Changeset bd808eb9cb94ea63df244aa3dc58acbfae932261

Show
Ignore:
Timestamp:
06/04/08 01:54:31 (4 years ago)
Author:
Lincoln de Sousa <lincoln@…>
Children:
9113d0edc69e4b37b5c41c3a9158264aba12a9ac
Parents:
390d7645630b1c52d36aa7329e0ea88a61410354
git-committer:
Lincoln de Sousa <lincoln@…> (06/04/08 01:54:31)
Message:

Cleaning up data/Makefile.am

Files:
2 modified

Legend:

Unmodified
Added
Removed

  • ChangeLog

    r08ee9dc rbd808eb  
    112008-06-03  Lincoln de Sousa  <lincoln@minaslivre.org> 
     2 
     3        * data/Makefile.am: Clean up. 
    24 
    35        * src/guake.py (Guake.show): Moving window after shown. 

  • data/Makefile.am

    r512b8d8 rbd808eb  
    1 @INTLTOOL_XML_RULE@ 
    2 @INTLTOOL_DESKTOP_RULE@ 
    3  
    41SUBDIRS = pixmaps 
    52 
    … …  
    107        prefs.glade 
    118 
    12 # .desktop file 
    13 Multimediadir = $(datadir)/applications 
    14 Multimedia_in_files = guake.desktop 
    15 Multimedia_DATA = $(Multimedia_in_files:.desktop.in=.desktop) 
    16  
    179# dbus service file 
    1810servicedir = $(datadir)/dbus-1/services 
    … …  
    2012service_DATA = $(service_in_files:.service.in=.service) 
    2113 
    22 # schema file. 
    23 # not using GCONF_SCHEMA_FILE_DIR because it is 
    24 # sending our schemafile to /usr dir =/ 
     14@INTLTOOL_DESKTOP_RULE@ 
     15desktopdir = $(datadir)/applications 
     16desktop_in_files = guake.desktop.in 
     17desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) 
     18 
     19@INTLTOOL_SCHEMAS_RULE@ 
    2520schemadir = $(sysconfdir)/gconf/schemas 
    2621schema_DATA = guake.schemas 
    2722 
     23EXTRA_DIST = \ 
     24        $(ui_DATA) \ 
     25        $(schema_DATA) \ 
     26        $(desktop_in_files) 
     27 
    2828if GCONF_SCHEMAS_INSTALL 
    29 install-data-local: $(schema_DATA) 
    30         GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA); 
     29install-data-local: 
     30        -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ 
     31        $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
    3132endif 
    3233 
    33 EXTRA_DIST = $(ui_DATA) \ 
    34                          $(schema_DATA) \ 
    35                          guake.desktop.in 
    36  
     34if GCONF_SCHEMAS_INSTALL 
     35uninstall-local: 
     36        -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ 
     37        $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA) 
     38endif