[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

19 files changed, 113 insertions, 61 deletions

diff --git a/Changelog b/Changelog
index 56b453ae..29dca5f0 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,22 @@
 -----------------
+Rev:  145
+Date: 17 May 2008
+User: MathStuf
+-----------------
+[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
+
+-----------------
+Rev:  144
+Date: 17 May 2008
+User: MathStuf
+-----------------
+[FIX] Fixed up the distsrc target
+
+-----------------
 Rev:  143
 Date: 17 May 2008
 User: MathStuf
diff --git a/general/general.pro b/general/general.pro
index 02d6a5b9..73405b21 100644
--- a/general/general.pro
+++ b/general/general.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 OBJECTS_DIR = .obj
-DESTDIR = ../../bin
+DESTDIR = ../bin
 
 CONFIG += qt \
  warn_on \
@@ -18,7 +18,6 @@ HEADERS += Flag.h \
  Matrix.h \
  Point.h
 
-INSTALLS += target
 isEmpty(PREFIX) {
     PREFIX = $$(PREFIX)/lib
 }
@@ -26,5 +25,4 @@ isEmpty(PREFIX) {
     PREFIX = /usr/lib`kde4-config --libsuffix`
 }
 target.path = $$PREFIX
-
-DISTFILES += TODO
+INSTALLS += target
diff --git a/make-tarball.sh b/make-tarball.sh
index efa75372..1d8a5e35 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -7,14 +7,11 @@ fi
 
 cd ..
 mkdir pokegen-$1
-cd pokegen-$1
-mkdir bin doc src
-cd ..
 for x in `svn ls -R -r HEAD src`; do
   if [ -d src/$x ]; then
-    mkdir pokegen-$1/src/$x;
+    mkdir pokegen-$1/$x;
   else
-    cp src/$x pokegen-$1/src/$x;
+    cp src/$x pokegen-$1/$x;
   fi
 done
 tar -c pokegen-$1 | bzip2 --best -c > releases/pokegen-$1.tar.bz2
diff --git a/pokegen.pro b/pokegen.pro
index d6c9f5dc..2937a742 100755
--- a/pokegen.pro
+++ b/pokegen.pro
@@ -15,13 +15,18 @@ SUBDIRS = general \
 distsrc.target = distsrc
 distsrc.commands = ./make-tarball.sh $${VERSION}
 
-doc.target = doc
-doc.commands = pdflatex pokegen.tex && \
- pdflatex pokegen.tex && \
- rm pokegen.aux pokegen.log pokegen.out pokegen.toc && \
- mv pokegen.pdf ../doc/pokegen.pdf
+QMAKE_EXTRA_UNIX_TARGETS += distsrc
 
-QMAKE_EXTRA_UNIX_TARGETS += distsrc doc
+isEmpty(PREFIX) {
+    PREFIX = $$(PREFIX)
+}
+isEmpty(PREFIX) {
+    PREFIX = /usr
+}
+documentation.path = $$PREFIX/share/doc/pokegen-$${VERSION}
+documentation.files = DISCLAIMER \
+ LICENSE
+INSTALLS += documentation
 
 win32 {
 ;     nsis-installer.target = nsis-installer
@@ -31,10 +36,10 @@ win32 {
 } mac {
 } else {
     rpm.target = rpm
-    rpm.commands = rpmbuild -bt ../releases/pokegen-$${VERSION}.tar.bz2 && \
+    rpm.commands = rpmbuild -ta ../releases/pokegen-$${VERSION}.tar.bz2 && \
      cp /usr/src/redhat/RPMS/$${ARCH}/pokegen-$${VERSION}.$${ARCH}.rpm ../pkg/ && \
      cp /usr/src/redhat/SRPMS/$${ARCH}/pokegen-$${VERSION}.src.rpm ../pkg/
-    rpm.depends = distsrc doc
+    rpm.depends = distsrc
 ;     deb.target = deb
 ;     deb.commands = dpkg -b
 ;     deb.depends = distsrc doc
diff --git a/pokegen.spec b/pokegen.spec
index 6692dafb..f629b52d 100644
--- a/pokegen.spec
+++ b/pokegen.spec
@@ -22,14 +22,16 @@ It includes a network play and other tools to help create custom games.
 
 %build
 cd src
-qmake-qt4
+qmake-qt4 PREFIX="%{_prefix}" CXXFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
+make doc
 
 
 %install
 rm -rf %{buildroot}
 mkdir %{buildroot}
-make DESTDIR=%{buildroot} install
+cd src
+make INSTALL_ROOT=%{buildroot} install
 desktop-file-install --vendor="fedora"       \
   --dir=%{buildroot}%{_datadir}/applications \
   %{SOURCE1}
@@ -43,7 +45,7 @@ rm -rf ${buildroot}
 %defattr(-,root,root,-)
 %doc /usr/share/doc/pokegen-%{version}/DISCLAIMER
 %doc /usr/share/doc/pokegen-%{version}/LICENSE
-%doc /usr/share/doc/pokegen-%{version}/pokegen.pdf
+%doc /usr/share/doc/pokegen-%{version}/pokemodr.pdf
 /usr/bin/pokemodr
 %{_libdir}/libgeneral.so
 %{_libdir}/libpokemod.so
diff --git a/pokegen/pokegen.pro b/pokegen/pokegen.pro
index 0ca2609c..5c90a310 100644
--- a/pokegen/pokegen.pro
+++ b/pokegen/pokegen.pro
@@ -1,19 +1,34 @@
 OBJECTS_DIR = .obj
-DESTDIR = ../../bin
+DESTDIR = ../bin
 TEMPLATE = app
-LIBS += -L../../lib -lgeneral -lpokemod -loverworld -lbattle -laudio -lmenus
+LIBS += -L../bin -lgeneral -lpokemod -loverworld -lbattle -laudio -lmenus
 
 CONFIG += qt \
-gui \
-warn_on \
-exceptions
-INCLUDEPATH += ../pokemod \
-../overworld \
-../menus \
-../general \
-../battle
-TARGETDEPS += ../../lib/libpokemod.so \
-../../lib/liboverworld.so \
-../../lib/libmenus.so \
-../../lib/libgeneral.so \
-../../lib/libbattle.so
+ gui \
+ warn_on \
+ exceptions
+TARGETDEPS += ../lib/libpokemod.so \
+ ../lib/liboverworld.so \
+ ../lib/libmenus.so \
+ ../lib/libgeneral.so \
+ ../lib/libbattle.so
+
+doc.target = doc
+doc.commands = pdflatex pokegen.tex && \
+ pdflatex pokegen.tex && \
+ rm pokegen.aux pokegen.log pokegen.out pokegen.toc && \
+ mv pokegen.pdf ../doc/pokegen.pdf
+
+QMAKE_EXTRA_UNIX_TARGETS += doc
+
+isEmpty(PREFIX) {
+    PREFIX = $$(PREFIX)
+}
+isEmpty(PREFIX) {
+    PREFIX = /usr
+}
+target.path = $$PREFIX/bin
+documentation.path = $$PREFIX/share/doc/pokegen/pokegen-$${VERSION}
+documentation.files = ../doc/pokegen.pdf
+documentation.extra = make doc
+INSTALLS += target documentation
diff --git a/pokegen.tex b/pokegen/pokegen.tex
index b09958e6..b09958e6 100644
--- a/pokegen.tex
+++ b/pokegen/pokegen.tex
diff --git a/pokemod/pokemod.pro b/pokemod/pokemod.pro
index 3bd2ed30..01ee42e8 100644
--- a/pokemod/pokemod.pro
+++ b/pokemod/pokemod.pro
@@ -1,8 +1,8 @@
 TEMPLATE = lib
 OBJECTS_DIR = .obj
 MOC_DIR = .moc
-DESTDIR = ../../bin
-LIBS += -L../../bin \
+DESTDIR = ../bin
+LIBS += -L../bin \
  -lgeneral
 
 CONFIG += qt \
@@ -91,7 +91,6 @@ HEADERS += AbilityEffect.h \
  Trainer.h \
  Type.h
 
-INSTALLS += target
 isEmpty(PREFIX) {
     PREFIX = $$(PREFIX)/lib
 }
@@ -99,5 +98,4 @@ isEmpty(PREFIX) {
     PREFIX = /usr/lib`kde4-config --libsuffix`
 }
 target.path = $$PREFIX
-
-DISTFILES += TODO
+INSTALLS += target
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