r1941: *** empty log message ***

diff --git a/doc/ctsim-gui.tex b/doc/ctsim-gui.tex
index f288d79acf7cea86417ebb043f723cebd06bec3b..964313727a43c0fbf80509a6c05586cf6cc5e229 100644 (file)
--- a/doc/ctsim-gui.tex
+++ b/doc/ctsim-gui.tex
@@ -154,10 +154,10 @@ value of \texttt{1}.}
 
 \subsection{File - Import}\label{IDH_DLG_IMPORT}
 This command allows the importing of non-\ctsim\ file formats into
-\ctsim\.  \texttt{PPM} and \texttt{PNG} formats will be read into an
+\ctsim.  \texttt{PPM} and \texttt{PNG} formats will be read into an
 imagefile window. Color images will be converted to grayscale. If a
-\texttt{DICOM} library was linked in with your version of \ctsim\,
-then you can also import \text{DICOM} projection files and image
+\texttt{DICOM} library was linked in with your version of \ctsim,
+then you can also import \texttt{DICOM} projection files and image
 files.
 
 \subsection{File - Preferences}\label{IDH_DLG_PREFERENCES}\index{Dialog!Preferences}

diff --git a/doc/ctsim.htb b/doc/ctsim.htb
deleted file mode 100644 (file)
index fd3fd16..0000000
Binary files a/doc/ctsim.htb and /dev/null differ

diff --git a/make-doc.sh b/make-doc.sh
index 108534a054adfd6f4d991359b1b43286d3fc01e5..95f0dcc0420b3206c0befb5984662c04e4c02334 100755 (executable)
--- a/make-doc.sh
+++ b/make-doc.sh
@@ -8,7 +8,6 @@ mkdir docs
 mv doc/html docs
 mv doc/ctsim.htb docs
 mv doc/ctsim.pdf docs
-mv doc/ctsim.ps docs
 pushd doc
 make clean
 popd

diff --git a/rpm/ctsim.spec b/rpm/ctsim.spec
index d8c7cae542862475a9414e1414604f4dd9c85a37..19f26ea76b4971dc5a69385a68b0eb4e4f222ea2 100644 (file)
--- a/rpm/ctsim.spec
+++ b/rpm/ctsim.spec
@@ -24,21 +24,10 @@ make
 %install
 strip src/ctsim
 strip tools/ctsimtext
-rm -f /usr/local/bin/if1
-rm -f /usr/local/bin/if2
-rm -f /usr/local/bin/ifexport
-rm -f /usr/local/bin/ifinfo
-rm -f /usr/local/bin/phm2if
-rm -f /usr/local/bin/phm2pj
-rm -f /usr/local/bin/pj2if
-rm -f /usr/local/bin/pjinfo
-rm -f /usr/local/bin/pjrec
-rm -f /usr/local/bin/ctsim
-rm -f /usr/local/bin/ctsimtext
-rm -rf /usr/local/man/ctsim.htb
 install -s -m 755 -o 0 -g 0 src/ctsim /usr/bin/ctsim
 install -s -m 755 -o 0 -g 0 tools/ctsimtext /usr/bin/ctsimtext
 install -m 755 -o 0 -g 0 tools/sample-ctsim.sh /usr/bin/sample-ctsim.sh
+mkdir -p /usr/share/ctsim
 install -m 755 -o 0 -g 0 doc/ctsim.htb /usr/share/ctsim/ctsim.htb
 ln -sf ctsimtext /usr/bin/if1
 ln -sf ctsimtext /usr/bin/if2