[Patch] make config.sh --debian and make deb work

I had to make some changes to get MP to build properly when running "make
deb"

I'm not sure what the proper protocol for submitting patches is here, so
I'll just include them at the end of my message.

After making these changes and running "dh_make", I was able to run "make
deb" and have a working .deb file created from the current GIT sources.

I can provide the .deb file if anyone is interested.

-- 
Paul Bonser
http://blog.paulbonser.com


---------------------

This patch is for mp-5.x, there was an error with a missing space in [-f
and mpdm and mpsl were being configured with the incorrect prefix when
"./config.sh --debian" or "./config.sh --prefix=/usr" was called.

--

diff --git a/config.sh b/config.sh
index 5467527..4822745 100755
--- a/config.sh
+++ b/config.sh
@@ -123,7 +123,7 @@ fi
 
 # If MPDM is not configured, do it
 if [ ! -f $MPDM/Makefile ] ; then
-	( echo ; cd $MPDM ; ./config.sh --docdir=$PREFIX/share/doc/$APPNAME
$CONF_ARGS ; echo )
+	( echo ; cd $MPDM ; ./config.sh --prefix=$PREFIX
--docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
 fi
 
 cat $MPDM/config.ldflags >> config.ldflags
@@ -149,7 +149,7 @@ fi
 
 # If MPSL is not configured, do it
 if [ ! -f $MPSL/Makefile ] ; then
-	( echo ; cd $MPSL ; ./config.sh --docdir=$PREFIX/share/doc/$APPNAME
$CONF_ARGS ; echo )
+	( echo ; cd $MPSL ; ./config.sh --prefix=$PREFIX
--docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
 fi
 
 cat $MPSL/config.ldflags >> config.ldflags
diff --git a/makefile.in b/makefile.in
index 02f4b9a..4895331 100644
--- a/makefile.in
+++ b/makefile.in
@@ -128,7 +128,7 @@ installdoc:
 	( cd $(MPSL); $(MAKE) installdoc )
 	install -m 644 doc/* $(PREFIX)/share/doc/$(APPNAME)
 	install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/$(APPNAME)
-	[-f doc/mp_index.html ] && install -m 644 doc/mp_index.html
$(PREFIX)/share/doc/$(APPNAME)/index.html || true
+	[ -f doc/mp_index.html ] && install -m 644 doc/mp_index.html
$(PREFIX)/share/doc/$(APPNAME)/index.html || true
 
 uninstall: uninstall-mo
 	rm -f $(PREFIX)/bin/$(APPNAME)

---------------

This patch is for mpdm. If grutatxt isn't installed, there will only be one
file in the doc directory, and so it was creating mpdm as a file rather
than a directory. Also, checking for mp_doccer was crashing saying
"unexpected operator ==", so I switched it to "=" instead and it seems to
be working now.

--

diff --git a/config.sh b/config.sh
index be0c230..3721bb6 100755
--- a/config.sh
+++ b/config.sh
@@ -422,7 +422,7 @@ fi
 echo -n "Testing if mp_doccer is installed... "
 MP_DOCCER=$(which mp_doccer || which mp-doccer)
 
-if [ $? == 0 ] ; then
+if [ $? = 0 ] ; then
 	echo "OK"
 	echo "MP_DOCCER=yes" >> makefile.opts
 	DOCS="$DOCS \$(MP_DOCCER_DOCS)"
diff --git a/makefile.in b/makefile.in
index 79116a1..013aa61 100644
--- a/makefile.in
+++ b/makefile.in
@@ -77,7 +77,7 @@ build-mo:
 	done
 
 installdoc:
-	install -m 644 doc/* $(DOCDIR)
+	install -m 644 doc/ -d $(DOCDIR)/
 	for f in README AUTHORS COPYING TODO RELEASE_NOTES ; do \
 		[ -f $$f ] && install -m 644 $$f $(DOCDIR)/$$f.$(PROJ) ; \
 	done

-----------------

This patch is for mpsl, fixing the same issue as the mpdm patch.

--

diff --git a/makefile.in b/makefile.in
index bf556e8..962b761 100644
--- a/makefile.in
+++ b/makefile.in
@@ -98,7 +98,7 @@ install: installdoc
 	install $(TARGET) $(PREFIX)/bin
 
 installdoc:
-	install -m 644 doc/* $(DOCDIR)
+	install -m 644 doc/ -d $(DOCDIR)/
 	for f in README AUTHORS COPYING TODO RELEASE_NOTES ; do \
 		[ -f $$f ] && install -m 644 $$f $(DOCDIR)/$$f.$(PROJ) ; \
 	done



-- 
To unsubscribe, send mail to mp-unsubscribe_lists.triptico.com.