[FIX] Minor fixes to the build

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

6 files changed, 14 insertions, 11 deletions

diff --git a/Changelog b/Changelog
index 29dca5f0..2c2b5d94 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,11 @@
 -----------------
+Rev:  146
+Date: 17 May 2008
+User: MathStuf
+-----------------
+[FIX] Minor fixes to the build
+
+-----------------
 Rev:  145
 Date: 17 May 2008
 User: MathStuf
diff --git a/make-tarball.sh b/make-tarball.sh
index 1d8a5e35..e3bc856f 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -5,13 +5,12 @@ if [ $# -lt 1 ]; then
   exit 1
 fi
 
-cd ..
 mkdir pokegen-$1
-for x in `svn ls -R -r HEAD src`; do
-  if [ -d src/$x ]; then
+for x in `svn ls -R -r HEAD`; do
+  if [ -d $x ]; then
     mkdir pokegen-$1/$x;
   else
-    cp src/$x pokegen-$1/$x;
+    cp $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 2937a742..7e1bf9de 100755
--- a/pokegen.pro
+++ b/pokegen.pro
@@ -36,9 +36,9 @@ win32 {
 } mac {
 } else {
     rpm.target = rpm
-    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.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
 ;     deb.target = deb
 ;     deb.commands = dpkg -b
diff --git a/pokegen.spec b/pokegen.spec
index f629b52d..d457f332 100644
--- a/pokegen.spec
+++ b/pokegen.spec
@@ -21,16 +21,13 @@ It includes a network play and other tools to help create custom games.
 
 
 %build
-cd src
 qmake-qt4 PREFIX="%{_prefix}" CXXFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
-make doc
 
 
 %install
 rm -rf %{buildroot}
 mkdir %{buildroot}
-cd src
 make INSTALL_ROOT=%{buildroot} install
 desktop-file-install --vendor="fedora"       \
   --dir=%{buildroot}%{_datadir}/applications \
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index 2c649d20..3455621a 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -291,5 +291,5 @@ resources.files = overlays/overlays.qrc \
  overlays/wilds.png
 documentation.path = $$PREFIX/share/doc/pokegen-$${VERSION}
 documentation.files = ../doc/pokemodr.pdf
-documentation.extra = make doc
+documentation.extra = pwd; make doc
 INSTALLS += target resources documentation
diff --git a/pokemodr/pokemodr.tex b/pokemodr/pokemodr.tex
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/pokemodr/pokemodr.tex