Merge pull request unihedron#1 from biot/build+gravity

Build+gravity

Author: unihedron

Makefile.in

@@ -1,9 +1,8 @@
 
-VERSION=@VERSION@
-NAME=@FULL-PACKAGE-NAME@
+VERSION=@PACKAGE_VERSION@
+NAME=@PACKAGE_NAME@
 LATEX=@LATEX@
 DVIPS=@DVIPS@
-PDF_VIEWER=@PDF_VIEWER@
 GS=@GS@
 CC=@CC@
 
@@ -17,7 +16,6 @@ spectrum: pictures
 	$(LATEX) tex/spectrum.tex
 	$(DVIPS)  -Ppdf -T 24in,36in spectrum.dvi -f > spectrum.eps
 	$(GS) -dSAFER -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=spectrum_current.pdf -dSAFER -c .setpdfwrite -f spectrum.eps
-	$(PDF_VIEWER) spectrum_current.pdf&
 
 pictures:
 	cd pictures && make
@@ -42,7 +40,6 @@ jpeg600:
 split:
 	poster -v -c5% -s1 -mletter  spectrum.eps -ospectrum_pages.eps
 	ps2pdf spectrum_pages.eps
-	$(PDF_VIEWER) spectrum_pages.pdf&
 	zip spectrum_pages spectrum_pages.pdf
 
 # Compile the C program that generates the numbers on the scales
@@ -110,8 +107,5 @@ dist:
 configure: configure.ac
 	autoconf
 
-Makefile: Makefile.in config.status
-	./config.status
-
 config.status: configure
 	[ ! -f config.status ] || ./config.status --recheck

configure

@@ -594,7 +594,6 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-PDF_VIEWER
 DVIPS
 LATEX
 GS
@@ -617,6 +616,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -686,6 +686,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -938,6 +939,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1075,7 +1085,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1228,6 +1238,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1981,51 +1992,6 @@ $as_echo "no" >&6; }
 fi
 
 
-for ac_prog in acroread, open
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PDF_VIEWER+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PDF_VIEWER in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PDF_VIEWER="$PDF_VIEWER" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PDF_VIEWER="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PDF_VIEWER=$ac_cv_path_PDF_VIEWER
-if test -n "$PDF_VIEWER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDF_VIEWER" >&5
-$as_echo "$PDF_VIEWER" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$PDF_VIEWER" && break
-done
-
 
 # Checks for programs.
 ac_ext=c

configure.ac

@@ -15,7 +15,6 @@ For example, run '$0 LATEX=some-other-latex'.]])
 }
 
 AC_PATH_PROG([DVIPS], [dvips])
-AC_PATH_PROGS([PDF_VIEWER], [acroread, open], [])
 
 # Checks for programs.
 AC_PROG_CC

doc/README

@@ -9,8 +9,17 @@ If you want to make changes and compile your own copy:
 	LaTeX
 	Ghostscript
 	SIunits (Tex) for the mathematical symbols.
+	PSTricks
+
+On Debian-derived systems, install the following packages:
+	ghostscript
+	texlive-science (for SIunits)
+	texlive-pstricks (for PSTricks)
+	texlive-lang-cyrillic (for Cyrillic text)
 
 ==========================================================================
 To Build from source:
 
 ./configure && make
+
+The output is in spectrum_current.pdf

pictures/Makefile

@@ -6,7 +6,6 @@ emr.pdf: emr.tex
 	@DVIPS@  -Ppdf -G0 emrmaster.dvi -f > emrmaster.eps
 	#ps2pdf emrmaster.eps
 	@GS@ -dSAFER -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=emrmaster.pdf -dSAFER -c .setpdfwrite -f emrmaster.eps
-	@PDF_VIEWER@ emrmaster.pdf&
 
 waves: waves.c
 	cc -lm -o waves waves.c

pictures/Makefile.in

@@ -4,13 +4,13 @@
 
 \begin{itemize}
 
-\item Gravity is the mysterious force that holds large objects together and binds our planets, stars, and galaxies together. Many people have unsuccessfully theorized about the details of gravity and its relationship to other forces. There have been no links between gravity waves and electromagnetic radiation.
+\item Gravity is the mysterious force which holds large objects together and binds our planets, stars, and galaxies together. Many people have unsuccessfully theorized about the details of gravity and its relationship to other forces. No links have been established between gravity waves and electromagnetic radiation.
 
 \item Gravity is theorized to warp space and time. In fact, gravity is responsible for bending light as observed by the gravity-lens example of distant galaxies.
 
-\item ``Gravitational waves" would appear as ripples in space-time formed by large objects moving through space that might possibly be detected in the future by very sensitive instruments.
+\item ``Gravitational waves" appear as ripples in space-time. Long theorized, a gravitational wave was first detected in 2015, and was caused by the merger of two black holes 1.4 billion light years away.
 
-\item The speed that gravity propagates through space has not yet been been determined.
+\item The speed with which gravity propagates through space has not yet been determined.
 
 \end{itemize}
 }