From 649ce407193daadac07d7c0d5e91b74f1574cd30 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 16 Dec 2009 04:16:39 +0000
Subject: * gcc4.4 compilation fixes * automake updates

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1062803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 scripts/Makefile.am       | 16 +++++++++-------
 scripts/create_makefile   |  2 +-
 scripts/kde-build         |  3 +++
 scripts/kde-devel-vim.vim |  2 +-
 scripts/qtdoc             |  5 +++++
 5 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3cea8486..89adcaa5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -41,17 +41,19 @@ EXTRA_DIST = completions kde-emacs \
 #%.1: %
 #	pod2man $< $@
 
+pod2man_options = "--center=K Desktop Environment (SDK)" "--release=KDE 3.5"
+
 kde-build.1: kde-build
-	pod2man $(srcdir)/kde-build > $@
+	pod2man $(pod2man_options) $< > $@
 kdesvn-build.1: kdesvn-build
-	pod2man $(srcdir)/kdesvn-build > $@
+	pod2man $(pod2man_options) $< > $@
 cvsversion.1: cvsversion
-	pod2man $(srcdir)/cvsversion > $@
+	pod2man $(pod2man_options) $< > $@
 cvscheck.1: cvscheck
-	pod2man $(srcdir)/cvscheck > $@
+	pod2man $(pod2man_options) $< > $@
 noncvslist.1: noncvslist
-	pod2man $(srcdir)/noncvslist > $@
+	pod2man $(pod2man_options) $< > $@
 cvsblame.1: cvsblame
-	pod2man $(srcdir)/cvsblame > $@
+	pod2man $(pod2man_options) $< > $@
 includemocs.1: includemocs
-	pod2man $(srcdir)/includemocs > $@
+	pod2man $(pod2man_options) $< > $@
diff --git a/scripts/create_makefile b/scripts/create_makefile
index e83b61d7..a27d3848 100755
--- a/scripts/create_makefile
+++ b/scripts/create_makefile
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Create Makefile.in and Makefile in a directory (containing a Makefile.am !)
 # Saves time compared to re-running configure completely
diff --git a/scripts/kde-build b/scripts/kde-build
index 5c9a111d..8790f602 100755
--- a/scripts/kde-build
+++ b/scripts/kde-build
@@ -881,6 +881,9 @@ The following error codes are returned by the script.
 
         cd ~/scripts/; vi ./kde-buildrc; ./kde-build
 
+On Debian systems, an example F<kde-buildrc> can be found in
+the directory /usr/share/doc/kdesdk-scripts/.
+
 =head1 BUGS
 
 Probably.
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index bcb02b4c..ddf2efa8 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -1,5 +1,5 @@
 " To use this file, add this line to your ~/.vimrc:, w/o the dquote
-" source /path/to/kde/sources/kdesdk/scripts/kde-devel-vim.vim
+" source /usr/share/kdesdk-scripts/kde-devel-vim.vim
 "
 " For CreateChangeLogEntry() : If you don't want to re-enter your
 " Name/Email in each vim session then make sure to have the viminfo
diff --git a/scripts/qtdoc b/scripts/qtdoc
index f92345d9..622353b3 100755
--- a/scripts/qtdoc
+++ b/scripts/qtdoc
@@ -1,4 +1,9 @@
 #!/bin/sh
+
+if [ -z "$QTDIR" ]; then
+  QTDIR=/usr/share/qt3
+fi
+
 # Run from command line, to open a qt help page in kfm/konqueror
 # No argument => main page
 # Classname (case insensitive) => page for this class
-- 
cgit v1.2.3