From 3fb0af5e2a407507b368cc12ae49cebc04fd1274 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Sat, 28 Dec 2013 10:40:20 -0600
Subject: [PATCH] Fix commit d32fe2e2.

---
 kbarcode/Makefile.am         |   6 ++++--
 kbarcode/pics/Makefile.am    |   2 ++
 kbarcode/{ => pics}/logo.png | Bin
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 kbarcode/pics/Makefile.am
 rename kbarcode/{ => pics}/logo.png (100%)

diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am
index 58aae3b..bfbc9c4 100644
--- a/kbarcode/Makefile.am
+++ b/kbarcode/Makefile.am
@@ -1,5 +1,7 @@
 ## Makefile.am for kbarcode
 
+SUBDIRS = pics
+
 # set the include path for X, qt and KDE
 INCLUDES = -I$(top_srcdir)/src $(all_includes)
 
@@ -8,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/src $(all_includes)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
-KDE_ICON = kbarcode
+KDE_ICON = AUTO
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kdedcoptest.pot
@@ -54,5 +56,5 @@ kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp \
 
 xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-label.desktop kbarcode-single.desktop
 
-datafiles_DATA = logo.png barcodes.html exampledata.sql labeldefinitions.sql barcode.ps rules.xml
+datafiles_DATA = barcodes.html exampledata.sql labeldefinitions.sql barcode.ps rules.xml
 datafilesdir = $(kde_datadir)/kbarcode
diff --git a/kbarcode/pics/Makefile.am b/kbarcode/pics/Makefile.am
new file mode 100644
index 0000000..7127f64
--- /dev/null
+++ b/kbarcode/pics/Makefile.am
@@ -0,0 +1,2 @@
+kbarcodepicsdir = $(kde_datadir)/kbarcode
+kbarcodepics_DATA = logo.png
\ No newline at end of file
diff --git a/kbarcode/logo.png b/kbarcode/pics/logo.png
similarity index 100%
rename from kbarcode/logo.png
rename to kbarcode/pics/logo.png