autoconf updates - Alex

diff --git a/Makefile.am b/Makefile.am
index c157e6e2dcc6e13fd4f09ff5d4c5ea075c22a7ce..7183067531dad744b4d1f223a5e35e64dcb78efe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign 
 SUBDIRS = src gnome-support doc
-SOURCES = README.GNOME README.PERFORMANCE terminatorX.spec terminatorX.spec.in
+EXTRA_DIST = COPYING-DOCS README.GNOME README.PERFORMANCE terminatorX.spec terminatorX.spec.in
 
 man_MANS = terminatorX.1

diff --git a/configure.in b/configure.in
index 4ca7001898bd5ba3f7419e7dd70f84f11bbd535c..fbb7ce6c25afa9e6e82b858a2b84e4609a96c76e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -460,14 +460,11 @@ AC_SUBST(XML_LIBS)
 AC_SUBST(XML_CFLAGS)
 
 if test "$prefix" != "NONE"; then
-       inst_pref=$datadir
+       inst_pref="\\\"$datadir\\\""
 else
-       inst_pref=/usr/local/share
+       inst_pref="\\\"/usr/local/share\\\""
 fi
 
-CFLAGS="$XML_CFLAGS $CFLAGS -DINSTALL_PREFIX="\\\"$inst_pref\\\"
-LIBS="$XML_LIBS $LIBS"
-
 dnl Scrollkeeper
 AC_PATH_PROG(SK_CONFIG,scrollkeeper-config,no)
 if test x$SK_CONFIG = xno; then
@@ -491,6 +488,10 @@ AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,, AC_MSG_ERROR([** DGA not installe
 if test "$enable_dga2" = yes; then
        AC_CHECK_LIB(Xxf86dga, XDGASelectInput,, AC_MSG_ERROR([** DGA2 not installed. Try using dga1 instead. **]), $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
 fi
+
+CFLAGS="$XML_CFLAGS $CFLAGS -DINSTALL_PREFIX=$inst_pref"
+LIBS="$XML_LIBS $LIBS"
+
 AC_OUTPUT(Makefile 
        src/Makefile 
        gnome-support/Makefile 

diff --git a/gnome-support/Makefile.am b/gnome-support/Makefile.am
index 9f7813d7f0f31bf170381858d17bc8777087cade..1cc4c6ade1e003b1bb586df4568f6b6178866efa 100644 (file)
--- a/gnome-support/Makefile.am
+++ b/gnome-support/Makefile.am
@@ -1,4 +1,4 @@
-SOURCES=terminatorX-app.png\
+EXTRA_DIST=terminatorX-app.png\
        terminatorX-mime.png\
        terminatorX.mime\
        tx-gnome-install\

diff --git a/src/Makefile.am b/src/Makefile.am
index 1cd13304fa45a33999d51724651215920867b129..afbe0889627d99be9e65044e63e339c7b785b920 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,12 +2,16 @@ LIBS=@X_LIBS@ @GTK_LIBS@ @LIBS@
 
 SUBDIRS = gui_icons smallknob
 
+EXTRA_DIST = README.MMX
+
 CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -D_REENTRANT
 CXXFLAGS=@CFLAGS@ @GTK_CFLAGS@ -D_REENTRANT
 
 license.c: $(top_srcdir)/COPYING
        @AWK@ -f $(srcdir)/licmak.awk < $(top_srcdir)/COPYING > $(srcdir)/license.c
 
+tX_dialog.o: license.c
+
 BUILT_SOURCES = license.c
 
 bin_PROGRAMS = terminatorX
@@ -24,7 +28,7 @@ terminatorX_SOURCES = tX_endian.c tX_dialog.cc tX_widget.c wav_write.c \
                        tX_audiodevice.cc tX_audiodevice.h tX_mastergui.cc \
                        3dnow.h mmx.h tX_audiofile.cc \
                        tX_audiofile.h tX_loaddlg.cc tX_loaddlg.h tX_icon.c \
-                       tX_icon.h README.MMX tX_prelis.cc tX_prelis.h \
+                       tX_icon.h tX_prelis.cc tX_prelis.h \
                        tX_seqpar.h tX_seqpar.cc tX_pbutton.cc tX_pbutton.h \
                        tX_event.h tX_event.cc tX_sequencer.h tX_sequencer.cc \
                        tX_knobloader.h tX_knobloader.c tX_dial.c tX_dial.h \

diff --git a/src/gui_icons/Makefile.am b/src/gui_icons/Makefile.am
index f1dd126fb60381b25a7a408fe18c1db046485522..0acac8a3ef8dbd885a7af4b1768908c0b862bc72 100644 (file)
--- a/src/gui_icons/Makefile.am
+++ b/src/gui_icons/Makefile.am
@@ -1,4 +1,4 @@
-SOURCES =      tx_audioengine.xpm\
+EXTRA_DIST =   tx_audioengine.xpm\
                tx_power.xpm\
                tx_grab.xpm\
                tx_record.xpm\

diff --git a/src/smallknob/Makefile.am b/src/smallknob/Makefile.am
index 3dd4155d21fb5280cf1fd8bde5542ba08573684d..ff6bd847e124d14fc1d735c1b0658e736172468d 100644 (file)
--- a/src/smallknob/Makefile.am
+++ b/src/smallknob/Makefile.am
@@ -1,4 +1,4 @@
-SOURCES =      knob0.xpm\
+EXTRA_DIST =   knob0.xpm\
                knob1.xpm\
                knob10.xpm\
                knob11.xpm\

diff --git a/terminatorX.spec.in b/terminatorX.spec.in
index e4d991be07d553ee08b2dd1e29efe5faf6572a34..04de4b66cb7737c3f265c1bf2a8a86263fa36000 100644 (file)
--- a/terminatorX.spec.in
+++ b/terminatorX.spec.in
@@ -85,7 +85,7 @@ find . -name "Makefile*" -print -exec rm -rf {} \;
 
 %files
 %defattr(0644,root,root,0755)
-%doc COPYING AUTHORS ChangeLog INSTALL NEWS README THANKS TODO README.GNOME README.PERFORMANCE doc
+%doc COPYING COPYING-DOCS AUTHORS ChangeLog INSTALL NEWS README THANKS TODO README.GNOME README.PERFORMANCE doc
 %attr(0755,root,root) %{_bindir}/terminatorX
 %{_mandir}/man1/terminatorX.1*
 %{_datadir}/mime-info/terminatorX.keys
@@ -93,11 +93,16 @@ find . -name "Makefile*" -print -exec rm -rf {} \;
 %{_datadir}/pixmaps/terminatorX-app.png
 %{_datadir}/pixmaps/terminatorX-mime.png
 %{_datadir}/gnome/apps/Multimedia/terminatorX.desktop
+%{_datadir}/omf/scrollkeeper-example2
+%{_datadir}/scrollkeeper-example2
 
 %post
+if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q -o %{_datadir}/omf/terminatorX; fi
 echo Note: Installing terminatorX \"suid root\" improves terminatorX\' performance 
 echo for non-root users, but poses a potential security threat. See \'INSTALL\' for
 echo details. To install terminatorX \"suid root\" run the following command:
 echo
 echo chmod u+s /usr/bin/terminatorX
 
+%postun
+if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q; fi