X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.spec.in;h=252a21fbc9f884be2d767d1af343359f8ad82f6e;hb=dcf6daa80768154d11c8853af7b52fc51fba4742;hp=5a4a0990fa0bd3b499b145cca44da5c5dd610783;hpb=bb2a403575996eee68edb9a5633ce40aecc08ac4;p=ghc-hetmet.git

diff --git a/ghc/ghc.spec.in b/ghc/ghc.spec.in
index 5a4a099..252a21f 100644
--- a/ghc/ghc.spec.in
+++ b/ghc/ghc.spec.in
@@ -54,6 +54,9 @@ They should be installed when GHC's profiling subsystem is needed.
 
 %changelog
 
+* Thu Jun 22 2000 Sven Panne
+- removed explicit usage of hslibs/docs, it belongs to ghc/docs/set
+
 * Sun Apr 23 2000 Manuel Chakravarty
 - revised for ghc 4.07; added suggestions from Pixel <pixel@mandrakesoft.com>
 - added profiling package
@@ -90,7 +93,8 @@ They should be installed when GHC's profiling subsystem is needed.
 #
 cat >mk/build.mk <<END
 GhcLibWays = p
-SRC_HAPPY_OPTS += -agc
+#SRC_HAPPY_OPTS += -agc # useful from Happy 1.7 onwards
+SRC_HAPPY_OPTS += -c
 END
 
 
@@ -101,15 +105,14 @@ make -C glafp-utils sgmlverb
 make all
 make -C docs ps html
 make -C ghc/docs ps html
-make -C hslibs/doc ps html
 
 %install
 # compress the non-html docs
 #
-for j in docs ghc/docs hslibs/doc; do
+for j in docs ghc/docs; do
   dir=`pwd`
   cd $j
-  for i in ps dvi sgml vsgml verb idx; do
+  for i in ps dvi sgml verb idx; do
     find . -name '*.'$i -exec gzip -9 '{}' ';' -print
   done
   cd $dir
@@ -121,16 +124,27 @@ make prefix=$RPM_BUILD_ROOT%{prefix}\
 # generate the file list for lib/ _excluding_ all files needed for profiling
 # only
 #
-ls -R %{prefix}/lib/* | grep -v -e ":$" -e "^$" -e ".p_hi" -e "_p.a"\
-  >rpm-noprof-lib-files
+# * generating file lists in a BUILD_ROOT spec is a bit tricky: the file list
+#   has to contain complete paths, _but_ without the BUILD_ROOT, we also do
+#   _not_ want have directory names in the list; furthermore, we have to make
+#   sure that any leading / is removed from %{prefix}/lib, as find has to 
+#   interpret the argument as a relative path; however, we have to include the
+#   leading / again in the final file list (otherwise, rpm complains)
+# * isn't there an easier way to do all this?
+#
+dir=`pwd`
+cd $RPM_BUILD_ROOT
+libdir=`echo %{prefix}/lib | sed 's|^/||'`
+find $libdir ! -type d ! -name '*.p_hi' ! -name '*_p.a' -print | sed 's|^|/|'\
+     >$dir/rpm-noprof-lib-files
+cd $dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f rpm-noprof-lib-files
-%doc docs/ CONTRIB/
-%doc ghc/ANNOUNCE ghc/PATCHLEVEL ghc/README ghc/docs/
-%doc hslibs/doc/
+%doc docs/
+%doc ghc/ANNOUNCE ghc/README ghc/docs/
 %{prefix}/bin/*
 
 %files prof