[FIX] Pokemodr overlays are now in overlays, not images/overlays

[FIX] Better installing procedures
[FIX] Desktop file now valid
[FIX] Building now does not touch out of main directory
[FIX] Documentation moved around to proper places

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@145 6ecfd1a5-f3ed-3746-8530-beee90d26b22

11 files changed, 40 insertions, 21 deletions

diff --git a/pokemodr/images/overlays.qrc b/pokemodr/images/overlays.qrc
deleted file mode 100644
index 98be3f31..00000000
--- a/pokemodr/images/overlays.qrc
+++ /dev/null
@@ -1,11 +0,0 @@
-<RCC>
-    <qresource prefix="/overlays" >
-        <file>overlays/effect.png</file>
-        <file>overlays/no-walk.png</file>
-        <file>overlays/trainer.png</file>
-        <file>overlays/walk.png</file>
-        <file>overlays/warp.png</file>
-        <file>overlays/water.png</file>
-        <file>overlays/wilds.png</file>
-    </qresource>
-</RCC>
diff --git a/pokemodr/images/overlays/effect.png b/pokemodr/overlays/effect.png
index 6d4c38a1..6d4c38a1 100644
--- a/pokemodr/images/overlays/effect.png
+++ b/pokemodr/overlays/effect.png
diff --git a/pokemodr/images/overlays/no-walk.png b/pokemodr/overlays/no-walk.png
index 11b15e81..11b15e81 100644
--- a/pokemodr/images/overlays/no-walk.png
+++ b/pokemodr/overlays/no-walk.png
diff --git a/pokemodr/overlays/overlays.qrc b/pokemodr/overlays/overlays.qrc
new file mode 100644
index 00000000..dbee4543
--- /dev/null
+++ b/pokemodr/overlays/overlays.qrc
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="" >
+        <file>effect.png</file>
+        <file>no-walk.png</file>
+        <file>trainer.png</file>
+        <file>walk.png</file>
+        <file>warp.png</file>
+        <file>water.png</file>
+        <file>wilds.png</file>
+    </qresource>
+</RCC>
diff --git a/pokemodr/images/overlays/trainer.png b/pokemodr/overlays/trainer.png
index e0d23cae..e0d23cae 100644
--- a/pokemodr/images/overlays/trainer.png
+++ b/pokemodr/overlays/trainer.png
diff --git a/pokemodr/images/overlays/walk.png b/pokemodr/overlays/walk.png
index f4e69557..f4e69557 100644
--- a/pokemodr/images/overlays/walk.png
+++ b/pokemodr/overlays/walk.png
diff --git a/pokemodr/images/overlays/warp.png b/pokemodr/overlays/warp.png
index 20baeb10..20baeb10 100644
--- a/pokemodr/images/overlays/warp.png
+++ b/pokemodr/overlays/warp.png
diff --git a/pokemodr/images/overlays/water.png b/pokemodr/overlays/water.png
index b625a0b0..b625a0b0 100644
--- a/pokemodr/images/overlays/water.png
+++ b/pokemodr/overlays/water.png
diff --git a/pokemodr/images/overlays/wilds.png b/pokemodr/overlays/wilds.png
index 45dcda5f..45dcda5f 100644
--- a/pokemodr/images/overlays/wilds.png
+++ b/pokemodr/overlays/wilds.png
diff --git a/pokemodr/pokemodr.desktop b/pokemodr/pokemodr.desktop
index 97854ee2..a87c55f4 100644
--- a/pokemodr/pokemodr.desktop
+++ b/pokemodr/pokemodr.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
-Version=0.0.1
+Encoding=UTF-8
 Type=Application
 Name=PokéModr
 Comment=Program to edit PokéMods
-TryExec=pokemodr
-Exec=pokemodr %U
+GenericName=Program to edit PokéMods
+Exec=/usr/bin/pokemodr %U
 Icon=pokemodr
-MimeType=text/x-pokemod+xml
+Categories=Qt;KDE;Game;
+MimeType=application/x-pokemod+xml;
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index 1b9be0fc..2c649d20 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -2,8 +2,8 @@ TEMPLATE = app
 OBJECTS_DIR = .obj
 UI_DIR = .ui
 MOC_DIR = .moc
-DESTDIR = ../../bin
-LIBS += -L../../bin \
+DESTDIR = ../bin
+LIBS += -L../bin \
  -lgeneral \
  -lpokemod \
  -lphonon \
@@ -19,7 +19,7 @@ QT += xml
     CONFIG += debug
 }
 
-RESOURCES += images/overlays.qrc
+RESOURCES += overlays/overlays.qrc
 
 win32 {
     TARGETDEPS += $${DESTDIR}/pokemod.dll $${DESTDIR}/general.dll
@@ -265,7 +265,14 @@ FORMS += gui/ability.ui \
  gui/trainer.ui \
  gui/type.ui
 
-INSTALLS += target
+doc.target = doc
+doc.commands = pdflatex pokemodr.tex && \
+ pdflatex pokemodr.tex && \
+ rm pokemodr.aux pokemodr.log pokemodr.out pokemodr.toc && \
+ mv pokemodr.pdf ../doc/pokemodr.pdf
+
+QMAKE_EXTRA_UNIX_TARGETS += doc
+
 isEmpty(PREFIX) {
     PREFIX = $$(PREFIX)
 }
@@ -273,5 +280,16 @@ isEmpty(PREFIX) {
     PREFIX = /usr
 }
 target.path = $$PREFIX/bin
-
-DISTFILES += TODO
+resources.path = $$PREFIX/share/pokegen/overlays
+resources.files = overlays/overlays.qrc \
+ overlays/effect.png \
+ overlays/no-walk.png \
+ overlays/trainer.png \
+ overlays/walk.png \
+ overlays/warp.png \
+ overlays/water.png \
+ overlays/wilds.png
+documentation.path = $$PREFIX/share/doc/pokegen-$${VERSION}
+documentation.files = ../doc/pokemodr.pdf
+documentation.extra = make doc
+INSTALLS += target resources documentation