(compose): remove setgcos

diff --git a/ChangeLog b/ChangeLog
index 493d58e56c7010d71311fb01ee3b8390aec500b0..5835aa749b307299ab7377bd0b520b53516aa823 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
+2006-10-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * stepmake/bin/add-html-footer.py (compose): remove setgcos
+
+2006-10-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * GNUmakefile.in (install-help2man): install-help2man target. 
+
 2006-10-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * SConstruct (configure): Do not check for /bin/sh.
 
 2006-10-27  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
-       * mf/GNUmakefile: explicit dependencies for .otftable files.
+       * mf/GNUmakefile: explicit dependencies for emmentaler .otf-table  files.
 
        * Documentation/topdocs/NEWS.tely (Top): add FretBoards example. 
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d609449c1200c7724cbf91eb713441a97a199eff..ffab58bd76996ba55cfdb697aac0430e9086b6c3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -52,16 +52,16 @@ install-WWW:
 
 install-help2man:
        $(MAKE) -C scripts man install-help2man
-       $(MAKE) -C lily/$(outdir) man install-help2man
+       $(MAKE) -C lily man install-help2man
 
 web-install:
        $(MAKE) out=www install-WWW
 
 uninstall-WWW:
-       #TODO
+       echo TODO
 
 web-uninstall:
-       $(MAKE) out=www uninstall-WWW=
+       $(MAKE) out=www uninstall-WWW
 
 local-install:
        $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 7f2ef65dcd89e80edeb9a57bda163098e3baec3a..d19a9a4b74fcb8fb5c04904ff31bb24d6c830165 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -10,7 +10,6 @@ import time
 import string 
 import getopt
 
-gcos = "unknown"
 index_url=''
 top_url=''
 changelog_file=''
@@ -104,23 +103,6 @@ for opt in options:
     else:
         raise 'unknown opt ', o
 
-#burp?
-def set_gcos ():
-    global gcos
-    os.environ["CONFIGSUFFIX"] = 'www';
-    if os.name == 'nt':
-        import ntpwd
-        pw = ntpwd.getpwname(os.environ['USERNAME'])
-    else:
-        import pwd
-        if os.environ.has_key('FAKEROOTKEY') and os.environ.has_key('LOGNAME'):
-            pw = pwd.getpwnam (os.environ['LOGNAME'])
-        else:
-            pw = pwd.getpwuid (os.getuid())
-
-    f = pw[4]
-    f = string.split (f, ',')[0]
-    gcos = f 
 
 def compose (default, file):
     s = default
@@ -128,7 +110,6 @@ def compose (default, file):
         s = open (file).read ()
     return s
 
-set_gcos ()
 localtime = time.strftime ('%c %Z', time.localtime (time.time ()))
 
 if os.path.basename (index_url) != "index.html":