From d41d56fdbefc1aa802460e740454fb1b38bf901c Mon Sep 17 00:00:00 2001
From: Christophe Grenier <grenier@cgsecurity.org>
Date: Sun, 2 Nov 2014 15:50:08 +0100
Subject: [PATCH] Rename ico directory to icons

---
 Makefile.am                 |   4 +---
 configure.ac                |   1 +
 icons/Makefile.am           |   1 +
 {ico => icons}/photorec.ico | Bin
 {ico => icons}/testdisk.ico | Bin
 src/Makefile.am             |   6 +++---
 src/icon_ph.rc              |   2 +-
 src/icon_qph.rc             |   2 +-
 src/icon_tst.rc             |   2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 icons/Makefile.am
 rename {ico => icons}/photorec.ico (100%)
 rename {ico => icons}/testdisk.ico (100%)

diff --git a/Makefile.am b/Makefile.am
index aa18c413..64bfeb5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,10 @@
-
-SUBDIRS = src man
+SUBDIRS = icons man src
 
 EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.sh \
 	progsreiserfs-journal.patch progsreiserfs-file-read.patch \
 	darwin/readme_mac_powerpc.txt darwin/readme_mac_intel.txt \
 	documentation.html \
 	dos/readme.txt \
-	ico/photorec.ico ico/testdisk.ico \
 	linux/testdisk.spec.in \
 	src/icon_ph.rc src/icon_qph.rc src/icon_tst.rc \
 	src/photorec_64x64.png \
diff --git a/configure.ac b/configure.ac
index 9fd77316..7695708a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -886,6 +886,7 @@ AC_SUBST(qphotorec_LDADD)
 AC_SUBST(qphotorec_CXXFLAGS)
 AC_CONFIG_FILES([
 	Makefile
+	icons/Makefile
 	src/Makefile
 	man/Makefile
 	man/testdisk.8 man/photorec.8 man/qphotorec.8 man/fidentify.8
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 00000000..c260fa07
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = photorec.ico testdisk.ico
diff --git a/ico/photorec.ico b/icons/photorec.ico
similarity index 100%
rename from ico/photorec.ico
rename to icons/photorec.ico
diff --git a/ico/testdisk.ico b/icons/testdisk.ico
similarity index 100%
rename from ico/testdisk.ico
rename to icons/testdisk.ico
diff --git a/src/Makefile.am b/src/Makefile.am
index d3ef52bb..60db6fb9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,9 @@
 	$(WINDRES) --include-dir $(srcdir) $< $@ 
 
 if USEICON
-ICON_TESTDISK=icon_tst.rc ../ico/testdisk.ico
-ICON_PHOTOREC=icon_ph.rc ../ico/photorec.ico
-ICON_QPHOTOREC=icon_qph.rc ../ico/photorec.ico
+ICON_TESTDISK=icon_tst.rc ../icons/testdisk.ico ../win/testdisk_win.exe.manifest
+ICON_PHOTOREC=icon_ph.rc ../icons/photorec.ico ../win/photorec_win.exe.manifest
+ICON_QPHOTOREC=icon_qph.rc ../icons/photorec.ico ../win/qphotorec_win.exe.manifest
 endif
 
 if USEQT
diff --git a/src/icon_ph.rc b/src/icon_ph.rc
index eff6e213..43a57d61 100644
--- a/src/icon_ph.rc
+++ b/src/icon_ph.rc
@@ -1,4 +1,4 @@
-app                      ICON    DISCARDABLE     "../ico/photorec.ico"
+app                      ICON    DISCARDABLE     "../icons/photorec.ico"
 
 //CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MOVEABLE PURE "../win/photorec_win.exe.manifest"
 1 24 "../win/photorec_win.exe.manifest"
diff --git a/src/icon_qph.rc b/src/icon_qph.rc
index 039e7bfc..83b4386a 100644
--- a/src/icon_qph.rc
+++ b/src/icon_qph.rc
@@ -1,4 +1,4 @@
-app                      ICON    DISCARDABLE     "../ico/photorec.ico"
+app                      ICON    DISCARDABLE     "../icons/photorec.ico"
 
 //CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MOVEABLE PURE "../win/qphotorec_win.exe.manifest"
 1 24 "../win/qphotorec_win.exe.manifest"
diff --git a/src/icon_tst.rc b/src/icon_tst.rc
index 9738548c..f5276dc2 100644
--- a/src/icon_tst.rc
+++ b/src/icon_tst.rc
@@ -1,4 +1,4 @@
-app                      ICON    DISCARDABLE     "../ico/testdisk.ico"
+app                      ICON    DISCARDABLE     "../icons/testdisk.ico"
 
 //CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MOVEABLE PURE "../win/testdisk_win.exe.manifest"
 1 24 MOVEABLE PURE "../win/testdisk_win.exe.manifest"