summaryrefslogtreecommitdiffstats
path: root/kbarcode
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-12-28 10:40:20 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-12-28 10:40:20 -0600
commit3fb0af5e2a407507b368cc12ae49cebc04fd1274 (patch)
tree854d9bc04e0dc0dcaaada938cdf6daeda3edfca8 /kbarcode
parentd32fe2e22a3424f8393a1c3ca788f6d00707919d (diff)
downloadkbarcode-3fb0af5e2a407507b368cc12ae49cebc04fd1274.tar.gz
kbarcode-3fb0af5e2a407507b368cc12ae49cebc04fd1274.zip
Fix commit d32fe2e2.
Diffstat (limited to 'kbarcode')
-rw-r--r--kbarcode/Makefile.am6
-rw-r--r--kbarcode/pics/Makefile.am2
-rw-r--r--kbarcode/pics/logo.png (renamed from kbarcode/logo.png)bin2384 -> 2384 bytes
3 files changed, 6 insertions, 2 deletions
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
index 0fe3891..0fe3891 100644
--- a/kbarcode/logo.png
+++ b/kbarcode/pics/logo.png
Binary files differ