Merging upstream version 0.7.0 (Closes: #493243, #510888, #567617, #699414, #709777...
[debian/lxpanel.git] / data / Makefile.am
index 00db8ec..1d87f35 100644 (file)
@@ -1,35 +1,34 @@
 default_config_DATA = \
        default/config
-default_configdir = $(datadir)/lxpanel/profile/default
+default_configdir = $(sysconfdir)/xdg/lxpanel/default
 
 default_config_panel_DATA = \
        default/panels/panel
-default_config_paneldir = $(datadir)/lxpanel/profile/default/panels
+default_config_paneldir = $(sysconfdir)/xdg/lxpanel/default/panels
 
 two_panels_config_DATA = \
        two_panels/config
-two_panels_configdir = $(datadir)/lxpanel/profile/two_panels
+two_panels_configdir = $(sysconfdir)/xdg/lxpanel/two_panels
 
 two_panels_config_panel_DATA = \
        two_panels/panels/bottom \
        two_panels/panels/top
-two_panels_config_paneldir = $(datadir)/lxpanel/profile/two_panels/panels
+two_panels_config_paneldir = $(sysconfdir)/xdg/lxpanel/two_panels/panels
 
 uidir=$(datadir)/lxpanel/ui
 ui_in_files= \
        ui/panel-pref.glade \
-       ui/launchbar.glade \
+       ui/launchtaskbar.glade \
        ui/netstatus.glade
 
 ui_DATA = $(ui_in_files:.glade=.ui)
 
-# Generate GtkBuilder UI files from Glade files
-%.ui: %.glade
-       cp $< $@
-       $(top_builddir)/src/xml-purge $@
+# Purge GtkBuilder UI files
+.glade.ui:
+       sed 's/<!--.*-->//' < $< | sed ':a;N;$$!ba;s/ *\n *</</g' > $@
 
 CLEANFILES = \
-        $(ui_DATA)
+       $(ui_DATA)
 
 
 lxpanel_images_DATA = \