changed some parametres

[livewp] / applet / data / Makefile.in

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index ac07958..412c636 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -243,7 +243,6 @@ matrixthemedir = $(datadir)/livewp/theme/Matrix
 matrixtheme_DATA = theme/Matrix/* 
 accelthemedir = $(datadir)/livewp/theme/Accel
 acceltheme_DATA = theme/Accel/* 
- = ======
 videothemedir = $(datadir)/livewp/theme/Video
 videotheme_DATA = theme/Video/* 
 dbus_servicedir = $(datadir)/dbus-1/services
@@ -257,7 +256,9 @@ icondir = $(datadir)/icons/hicolor
 EXTRA_DIST = $(berlintheme_DATA) \
             $(moderntheme_DATA) \
             $(matrixtheme_DATA) \
-<<<<<<< HEAD
+            $(acceltheme_DATA) \
+            $(videotheme_DATA) \
+            $(dbus_service_DATA)
 
 all: all-am
 
@@ -428,7 +429,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern
+       $(mkdir_p) $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Video
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -556,9 +557,6 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
        uninstall-videothemeDATA
 
 
-<<<<<<< HEAD
->>>>>>> master
-
 install-data-local:
        i=livewp; \
        $(mkinstalldirs) $(DESTDIR)$(icondir)/26x26/hildon; \
@@ -573,11 +571,6 @@ uninstall-local:
        rm $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \
        rm $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \
        $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
-            $(acceltheme_DATA) \
-=======
-            $(videotheme_DATA) \
->>>>>>> master
-            $(dbus_service_DATA)
 
 livewp.desktop: livewp.desktop.in
        sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \