pmccabe2html: Don't hard code awk path.

diff --git a/ChangeLog b/ChangeLog
index e062128..bcc837e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-02  Simon Josefsson  <simon@josefsson.org>
+
+       * m4/pmccabe2html.m4: Remove file.
+       * modules/pmccabe2html: Drop pmccabe2html.m4.  Don't call m4
+       function.  Change maintainer.
+       * build-aux/pmccabe2html: Use /bin/sh with magic instead of
+       hard-coding path to awk.  Tiny patch from ludo@gnu.org (Ludovic
+       Courtès).
+
 2009-10-31  Eric Blake  <ebb9@byu.net>
 
        fseeko: fix m4 regression

diff --git a/build-aux/pmccabe2html b/build-aux/pmccabe2html
index 27bb8f3..bc0f6e8 100755 (executable)
--- a/build-aux/pmccabe2html
+++ b/build-aux/pmccabe2html
@@ -1,7 +1,8 @@
-#!/usr/bin/awk -f
+#!/bin/sh
+exec awk -f "$0" "$@"
 # pmccabe2html - pmccabe to html converter
 
-# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/m4/pmccabe2html.m4 b/m4/pmccabe2html.m4
deleted file mode 100644 (file)
index 2985f7c..0000000
--- a/m4/pmccabe2html.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# pmccabe2html.m4 serial 2
-dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Simon Josefsson
-
-# Usage: gl_PMCCABE2HTML([]).
-AC_DEFUN([gl_PMCCABE2HTML],
-[
-  AC_REQUIRE([AC_PROG_AWK])
-  AC_PATH_PROG([PMCCABE], [pmccabe], [false])
-])

diff --git a/modules/pmccabe2html b/modules/pmccabe2html
index 50db333..8ab7d78 100644 (file)
--- a/modules/pmccabe2html
+++ b/modules/pmccabe2html
@@ -3,14 +3,12 @@ Produce fancy cyclomatic code complexity charts, using pmccabe.
 See <http://www.parisc-linux.org/~bame/pmccabe/>.
 
 Files:
-m4/pmccabe2html.m4
 build-aux/pmccabe2html
 build-aux/pmccabe.css
 
 Depends-on:
 
 configure.ac:
-gl_PMCCABE2HTML
 
 Makefile.am:
 
@@ -20,4 +18,4 @@ License:
 GPLed build tool
 
 Maintainer:
-gnupdf
+gnupdf and Simon Josefsson