new warnings in hivex-1.3.10
by Olaf Hering
hivex-1.3.10 does not pass the sles11sp3 post-build-checks anymore,
1.3.8 was still ok. The relevant output is:
...
[ 57s] Hivex.xs: In function 'XS_Win__Hivex_node_name':
[ 57s] Hivex.xs:236: warning: implicit declaration of function 'newSVpvn_utf8'
[ 57s] Hivex.xs:236: warning: assignment makes pointer from integer without a cast
[ 57s] Hivex.xs: In function 'XS_Win__Hivex_value_key':
[ 57s] Hivex.xs:384: warning: assignment makes pointer from integer without a cast
[ 57s] Hivex.xs: In function 'XS_Win__Hivex_value_data_cell_offset':
[ 57s] Hivex.xs:448: warning: too many arguments for format
...
[ 155s] E: hivex 64bit-portability-issue Hivex.xs:236, 384
...
How can this be fixed? I'm not seeing this in openSUSE 12.x.
Olaf
10 years, 6 months
How to expand a partition (along with the filesystem on it) on a device?
by Peng Yu
Hi,
I want to expand /dev/sda5 so that it takes the remaining space in
/dev/sda. But virt-resize does not work. Does anybody know how to make
it work? Thanks.
$ sudo virt-filesystems --long -h --all -a saiph.qcow2
Name Type VFS Label MBR Size Parent
/dev/sda1 filesystem ext2 - - 243M -
/dev/sda2 filesystem unknown - - 1.0K -
/dev/mintaka-vg/root filesystem ext4 - - 7.8G -
/dev/mintaka-vg/root lv - - - 7.8G /dev/mintaka-vg
/dev/mintaka-vg vg - - - 7.8G /dev/sda5
/dev/sda5 pv - - - 7.8G -
/dev/sda1 partition - - 83 243M /dev/sda
/dev/sda2 partition - - 05 1.0K /dev/sda
/dev/sda5 partition - - 8e 7.8G /dev/sda
/dev/sda device - - - 50G -
$ sudo virt-filesystems --long -h --all -a saiph_expand.qcow2
Name Type VFS Label MBR Size Parent
/dev/sda1 filesystem ext2 - - 243M -
/dev/sda2 filesystem unknown - - 1.0K -
/dev/mintaka-vg/root filesystem ext4 - - 7.8G -
/dev/mintaka-vg/root lv - - - 7.8G /dev/mintaka-vg
/dev/mintaka-vg vg - - - 7.8G /dev/sda5
/dev/sda5 pv - - - 7.8G -
/dev/sda1 partition - - 83 243M /dev/sda
/dev/sda2 partition - - 05 1.0K /dev/sda
/dev/sda5 partition - - 8e 7.8G /dev/sda
/dev/sda device - - - 50G -
$ sudo virt-resize -d --expand /dev/sda5 saiph.qcow2 saiph_expand.qcow2
command line: virt-resize -d --expand /dev/sda5 saiph.qcow2 saiph_expand.qcow2
Examining saiph.qcow2 ...
libguestfs: trace: add_drive "saiph.qcow2" "readonly:true"
libguestfs: trace: add_drive = 0
libguestfs: trace: add_drive "saiph_expand.qcow2" "readonly:false"
libguestfs: trace: add_drive = 0
libguestfs: trace: launch
libguestfs: trace: get_tmpdir
libguestfs: trace: get_tmpdir = "/tmp"
libguestfs: trace: get_cachedir
libguestfs: trace: get_cachedir = "/var/tmp"
libguestfs: trace: launch = 0
libguestfs: trace: lvm_set_filter "/dev/sda"
libguestfs: trace: lvm_set_filter = 0
libguestfs: trace: feature_available "ntfsprogs ntfs3g"
libguestfs: trace: feature_available = 1
libguestfs: trace: feature_available "btrfs"
libguestfs: trace: feature_available = 1
libguestfs: trace: blockdev_getss "/dev/sdb"
libguestfs: trace: blockdev_getss = 512
libguestfs: trace: blockdev_getsize64 "/dev/sda"
libguestfs: trace: blockdev_getsize64 = 53687091200
libguestfs: trace: blockdev_getsize64 "/dev/sdb"
libguestfs: trace: blockdev_getsize64 = 53687091200
libguestfs: trace: part_get_parttype "/dev/sda"
libguestfs: trace: part_get_parttype = "msdos"
saiph.qcow2 size 53687091200 bytes
saiph_expand.qcow2 size 53687091200 bytes
partition table type: msdos
libguestfs: trace: pvs_full
libguestfs: trace: pvs_full = <struct guestfs_lvm_pv_list *>
libguestfs: trace: part_list "/dev/sda"
libguestfs: trace: part_list = <struct guestfs_partition_list *>
libguestfs: trace: part_get_bootable "/dev/sda" 1
libguestfs: trace: part_get_bootable = 1
libguestfs: trace: part_get_mbr_id "/dev/sda" 1
libguestfs: trace: part_get_mbr_id = 131
libguestfs: trace: vfs_type "/dev/sda1"
libguestfs: trace: vfs_type = "ext2"
libguestfs: trace: mount_ro "/dev/sda1" "/"
libguestfs: trace: mount_ro = 0
libguestfs: trace: statvfs "/"
libguestfs: trace: statvfs = <struct guestfs_statvfs *>
libguestfs: trace: part_get_bootable "/dev/sda" 2
libguestfs: trace: part_get_bootable = 0
libguestfs: trace: part_get_mbr_id "/dev/sda" 2
libguestfs: trace: part_get_mbr_id = 5
libguestfs: trace: lvs
libguestfs: trace: lvs = ["/dev/mintaka-vg/root"]
libguestfs: trace: vfs_type "/dev/mintaka-vg/root"
libguestfs: trace: vfs_type = "ext4"
libguestfs: trace: mount_ro "/dev/mintaka-vg/root" "/"
libguestfs: trace: mount_ro = 0
libguestfs: trace: statvfs "/"
libguestfs: trace: statvfs = <struct guestfs_statvfs *>
2 partitions found
/dev/sda1:
partition data: 1 1048576-255852543 (254803968 bytes)
bootable: true
partition ID: 0x83
content: filesystem ext2 (246755328 bytes)
/dev/sda2:
partition data: 2 256900096-8588886015 (8331985920 bytes)
bootable: false
partition ID: 0x5
content: extended partition
1 logical volumes found
/dev/mintaka-vg/root:
content: filesystem ext4 (8130584576 bytes)
calculate surplus: outsize=53687091200 required=8586789888
overhead=2326528 surplus=45097974784
libguestfs: trace: canonical_device_name "/dev/sda5"
libguestfs: trace: canonical_device_name = "/dev/sda5"
surplus before --expand or --shrink: 45097974784
virt-resize: error: /dev/sda5: partition not found in the source disk
image (this error came from '--expand' option on the command line).
Try running this command: virt-filesystems --partitions --long -a
saiph.qcow2
If reporting bugs, run virt-resize with the '-d' option and include the
complete output.
libguestfs: trace: close
libguestfs: trace: internal_autosync
libguestfs: trace: internal_autosync = 0
--
Regards,
Peng
10 years, 6 months
[PATCH] tests: simple test for execstack supermin
by Pino Toscano
Add a simple test which uses scanelf or readelf to detect whether the
supermin executable is really not executable.
Kind of followup of commit c9f7a7998021e1cbe22a8ec325d43e2bdc3eff5a.
---
tests/Makefile.am | 1 +
tests/test-execstack.sh | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100755 tests/test-execstack.sh
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc73737..4dc5958 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = \
TESTS = \
test-basic.sh \
+ test-execstack.sh \
test-build-bash.sh \
test-binaries-exist.sh \
test-harder.sh
diff --git a/tests/test-execstack.sh b/tests/test-execstack.sh
new file mode 100755
index 0000000..a9cb5e0
--- /dev/null
+++ b/tests/test-execstack.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -
+# supermin
+# (C) Copyright 2014 Red Hat 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+set -e
+
+if scanelf --help >/dev/null 2>&1; then
+ echo "using scanelf"
+ scanelf -e ../src/supermin
+ test `scanelf -qe ../src/supermin | wc -l` -eq 0
+elif readelf --help >/dev/null 2>&1; then
+ echo "using readelf"
+ readelf -lW ../src/supermin | grep GNU_STACK
+ ! readelf -lW ../src/supermin | grep GNU_STACK | grep 'E ' >/dev/null 2>&1
+else
+ echo "$0: test skipped because none of the following tools is installed: scanelf, readelf"
+ exit 77
+fi
--
1.9.0
10 years, 6 months
[PATCH] configure: always add the extra warnings
by Pino Toscano
Get rid of --enable-gcc-warnings and just add all the warnings in any
case; they are tested anyway, so only warnings supported by the compiler
will be used.
Regarding -Werror, add a new --enable-werror which enables its use.
---
configure.ac | 106 +++++++++++++++++++++++++++++------------------------------
1 file changed, 53 insertions(+), 53 deletions(-)
diff --git a/configure.ac b/configure.ac
index 951ee54..3087b9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,80 +131,80 @@ AC_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_CPP
-AC_ARG_ENABLE([gcc-warnings],
- [AS_HELP_STRING([--enable-gcc-warnings],
- [turn on lots of GCC warnings (for developers)])],
+AC_ARG_ENABLE([werror],
+ [AS_HELP_STRING([--enable-werror],
+ [turn GCC warnings into errors (for developers)])],
[case $enableval in
yes|no) ;;
- *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
+ *) AC_MSG_ERROR([bad value $enableval for werror option]) ;;
esac
- gl_gcc_warnings=$enableval],
- [gl_gcc_warnings=no]
+ gl_gcc_werror=$enableval],
+ [gl_gcc_werror=no]
)
-if test "$gl_gcc_warnings" = yes; then
+if test "$gl_gcc_werror" = yes; then
gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
AC_SUBST([WERROR_CFLAGS])
+fi
- # This, $nw, is the list of warnings we disable.
- nw=
- nw="$nw -Waggregate-return" # anachronistic
- nw="$nw -Wc++-compat" # We don't care about C++ compilers
- nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib
- nw="$nw -Wtraditional" # Warns on #elif which we use often
- nw="$nw -Wcast-qual" # Too many warnings for now
- nw="$nw -Wconversion" # Too many warnings for now
- nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
- nw="$nw -Wsign-conversion" # Not an error
- nw="$nw -Wtraditional-conversion" # Don't care about pre-ANSI compilers
- nw="$nw -Wpadded" # Our structs are not padded
- nw="$nw -Wvla" # two warnings in mount.c
- # things I might fix soon:
- nw="$nw -Wmissing-format-attribute" # daemon.h's asprintf_nowarn
- nw="$nw -Winline" # daemon.h's asprintf_nowarn
- nw="$nw -Wshadow" # numerous, plus we're not unanimous
- nw="$nw -Wunsafe-loop-optimizations" # just a warning that an optimization
+dnl This, $nw, is the list of warnings we disable.
+nw=
+nw="$nw -Waggregate-return" # anachronistic
+nw="$nw -Wc++-compat" # We don't care about C++ compilers
+nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib
+nw="$nw -Wtraditional" # Warns on #elif which we use often
+nw="$nw -Wcast-qual" # Too many warnings for now
+nw="$nw -Wconversion" # Too many warnings for now
+nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
+nw="$nw -Wsign-conversion" # Not an error
+nw="$nw -Wtraditional-conversion" # Don't care about pre-ANSI compilers
+nw="$nw -Wpadded" # Our structs are not padded
+nw="$nw -Wvla" # two warnings in mount.c
+dnl things I might fix soon:
+nw="$nw -Wmissing-format-attribute" # daemon.h's asprintf_nowarn
+nw="$nw -Winline" # daemon.h's asprintf_nowarn
+nw="$nw -Wshadow" # numerous, plus we're not unanimous
+nw="$nw -Wunsafe-loop-optimizations" # just a warning that an optimization
# was not possible, safe to ignore
- nw="$nw -Wpacked" # Allow attribute((packed)) on structs
- nw="$nw -Wlong-long" # Allow long long since it's required
+nw="$nw -Wpacked" # Allow attribute((packed)) on structs
+nw="$nw -Wlong-long" # Allow long long since it's required
# by Python, Ruby and xstrtoll.
- nw="$nw -Wsuggest-attribute=pure" # Don't suggest pure functions.
- nw="$nw -Wsuggest-attribute=const" # Don't suggest const functions.
- nw="$nw -Wunsuffixed-float-constants" # Don't care about these.
- nw="$nw -Wswitch-default" # This warning is actively dangerous.
- nw="$nw -Woverlength-strings" # Who cares about stupid ISO C99 limit.
-
- gl_MANYWARN_ALL_GCC([ws])
- gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
- for w in $ws; do
- gl_WARN_ADD([$w])
- done
+nw="$nw -Wsuggest-attribute=pure" # Don't suggest pure functions.
+nw="$nw -Wsuggest-attribute=const" # Don't suggest const functions.
+nw="$nw -Wunsuffixed-float-constants" # Don't care about these.
+nw="$nw -Wswitch-default" # This warning is actively dangerous.
+nw="$nw -Woverlength-strings" # Who cares about stupid ISO C99 limit.
- # Normally we disable warnings in $nw above. However $nw only
- # filters out exact matching warning strings from a list inside
- # gnulib (see m4/manywarnings.m4). So we need to explicitly list a
- # few disabled warnings below.
+gl_MANYWARN_ALL_GCC([ws])
+gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
+for w in $ws; do
+ gl_WARN_ADD([$w])
+done
- # Unused parameters are not a bug.
- gl_WARN_ADD([-Wno-unused-parameter])
+dnl Normally we disable warnings in $nw above. However $nw only
+dnl filters out exact matching warning strings from a list inside
+dnl gnulib (see m4/manywarnings.m4). So we need to explicitly list a
+dnl few disabled warnings below.
- # Missing field initializers is not a bug in C.
- gl_WARN_ADD([-Wno-missing-field-initializers])
+dnl Unused parameters are not a bug.
+gl_WARN_ADD([-Wno-unused-parameter])
- # Display the name of the warning option with the warning.
- gl_WARN_ADD([-fdiagnostics-show-option])
+dnl Missing field initializers is not a bug in C.
+gl_WARN_ADD([-Wno-missing-field-initializers])
- AC_SUBST([WARN_CFLAGS])
+dnl Display the name of the warning option with the warning.
+gl_WARN_ADD([-fdiagnostics-show-option])
- AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
- AC_DEFINE([GNULIB_PORTCHECK], [1], [Enable some gnulib portability checks.])
- AH_VERBATIM([FORTIFY_SOURCE],[
+AC_SUBST([WARN_CFLAGS])
+
+AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
+AC_DEFINE([GNULIB_PORTCHECK], [1], [Enable some gnulib portability checks.])
+AH_VERBATIM([FORTIFY_SOURCE],[
/* Enable compile-time and run-time bounds-checking, and some warnings. */
#if __OPTIMIZE__ && (! defined (_FORTIFY_SOURCE) || _FORTIFY_SOURCE < 2)
# undef _FORTIFY_SOURCE
# define _FORTIFY_SOURCE 2
#endif])
-fi
AC_C_PROTOTYPES
test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
--
1.9.0
10 years, 6 months
[PATCH] appliance: update Debian-specific package list
by Hilko Bengen
---
appliance/packagelist.in | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index d241ec9..27106c8 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -60,11 +60,13 @@ ifelse(DEBIAN,1,
e2fsprogs
extlinux
genisoimage
- gfs-tools
- gfs2-tools
+ gfs2-utils
grub2-common
hfsplus
- iproute
+ iproute2
+ iputils-ping
+ iputils-arping
+ iputils-tracepath
libaugeas0
libcap2
libhivex0
--
2.0.0.rc2
10 years, 6 months
[PATCH 1/2] tests/syslinux: factorize search for mbr.bin
by Pino Toscano
---
tests/syslinux/test-syslinux.pl | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/tests/syslinux/test-syslinux.pl b/tests/syslinux/test-syslinux.pl
index d86c095..8a227d4 100755
--- a/tests/syslinux/test-syslinux.pl
+++ b/tests/syslinux/test-syslinux.pl
@@ -29,13 +29,20 @@ my $bootloader = $ENV{BOOTLOADER} || "syslinux";
my $disk = "$bootloader-guest.img";
# Find prerequisites.
-my $mbr = "/usr/share/syslinux/mbr.bin";
-unless (-f $mbr) {
- $mbr = "/usr/lib/syslinux/mbr.bin";
- unless (-f $mbr) {
- print "$0: mbr.bin (from SYSLINUX) not found, skipping test\n";
- exit 77;
- }
+my $mbr;
+my @mbr_paths = (
+ "/usr/share/syslinux/mbr.bin",
+ "/usr/lib/syslinux/mbr.bin"
+);
+foreach my $m (@mbr_paths) {
+ if (-f $m) {
+ $mbr = $m;
+ last;
+ }
+}
+if (not length ($mbr)) {
+ print "$0: mbr.bin (from SYSLINUX) not found, skipping test\n";
+ exit 77;
}
print "mbr: $mbr\n";
--
1.9.0
10 years, 6 months
[PATCH] Fix build on HPPA
by Pino Toscano
From: Helge Deller <deller(a)gmx.de>
The HPPA assembler syntax is slightly different than the GNU as to keep
compatibility to the HP-UX assembler.
Reported in https://bugs.debian.org/742797.
---
src/bin2s.pl | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/bin2s.pl b/src/bin2s.pl
index 1b1c253..0f892f8 100755
--- a/src/bin2s.pl
+++ b/src/bin2s.pl
@@ -43,7 +43,11 @@ print $ofh <<"EOF";
_binary_${infile}_end:
+#if defined(__hppa__)
+\t_binary_${infile}_size: .equ $sz
+#else
\t.equ _binary_${infile}_size, $sz
+#endif
EOF
close $ofh;
--
1.9.0
10 years, 6 months
XML parsing in libguestfs & recent libvirt CVE
by Pino Toscano
Hi,
today the libvirt security notice LSN-2014-0003 [1] has been published,
fixing an arbitrary file reading and a potential DoS issue due to unsafe
XML reading (unchecked expansion of entities).
We inspected libguestfs in the few parts that parse XML input (two from
results of libvirt API calls, and one parsing the libosinfo data), and
found no issues in the way the parsing was done.
However, to be more more sure about not relying on network nor expanding
entities, we just pushed a patch to allow passing fine-grained parsing
flags, so we can control better the parsing. This is commit
845daded5fddc70fc5e822769bc1e2a8cbead7ca
[1] https://www.redhat.com/archives/libvir-list/2014-May/msg00209.html
--
Pino Toscano
10 years, 6 months
[PATCH] test-charset-fidelity: allow to skip testing specific FSes
by Pino Toscano
Allow to skip testing the filesystem "foo" if the environment variable
SKIP_TEST_CHARSET_FIDELITY_foo=1 is set. This way it possible to not
test one or more filesystems without disabling the test altogether.
---
tests/charsets/test-charset-fidelity.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tests/charsets/test-charset-fidelity.c b/tests/charsets/test-charset-fidelity.c
index c669b9d..654ea0f 100644
--- a/tests/charsets/test-charset-fidelity.c
+++ b/tests/charsets/test-charset-fidelity.c
@@ -33,6 +33,8 @@
#include "guestfs.h"
#include "guestfs-internal-frontend.h"
+static const char ourenvvar[] = "SKIP_TEST_CHARSET_FIDELITY";
+
struct filesystem {
const char *fs_name; /* Name of filesystem. */
int fs_case_insensitive; /* True if filesystem is case insensitive. */
@@ -78,7 +80,7 @@ main (int argc, char *argv[])
struct filesystem *fs;
/* Allow this test to be skipped. */
- str = getenv ("SKIP_TEST_CHARSET_FIDELITY");
+ str = getenv (ourenvvar);
if (str && STREQ (str, "1")) {
printf ("%s: test skipped because environment variable is set.\n",
program_name);
@@ -113,6 +115,8 @@ static void
test_filesystem (guestfs_h *g, const struct filesystem *fs)
{
const char *feature[] = { fs->fs_feature, NULL };
+ char envvar[sizeof (ourenvvar) + 20];
+ char *str;
if (fs->fs_feature && !guestfs_feature_available (g, (char **) feature)) {
printf ("skipped test of %s because %s feature not available\n",
@@ -120,6 +124,14 @@ test_filesystem (guestfs_h *g, const struct filesystem *fs)
return;
}
+ snprintf (envvar, sizeof (envvar) - 1, "%s_%s", ourenvvar, fs->fs_name);
+ str = getenv (envvar);
+ if (str && STREQ (str, "1")) {
+ printf ("skipped test of %s because environment variable is set\n",
+ fs->fs_name);
+ return;
+ }
+
printf ("testing charset fidelity on %s\n", fs->fs_name);
make_filesystem (g, fs);
--
1.9.0
10 years, 6 months
[PATCH 1/3] build: fix srcdir!=builddir builds
by Pino Toscano
Fix the build system to support a build directory different than the
source directory:
- fix the include path to gnulib
- properly depend on and use files in the source directory
- fix the ocaml dependency calculation, making sure it picks the files
from all the places
---
src/Makefile.am | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 932881b..77aa611 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,7 +99,7 @@ supermin_SOURCES = $(SOURCES_C)
supermin_CFLAGS = \
-I$(shell $(OCAMLC) -where) \
$(EXT2FS_CFLAGS) $(COM_ERR_CFLAGS) \
- -I$(srcdir)/lib -I../lib
+ -I$(top_srcdir)/lib -I../lib
BOBJECTS = $(SOURCES_ML:.ml=.cmo)
XOBJECTS = $(SOURCES_ML:.ml=.cmx)
@@ -148,16 +148,16 @@ ext2init-bin.S: init
strip --strip-all $<
@file $< | grep -isq static || \
(echo "*** error: init is not staticly linked"; exit 1)
- ./bin2s.pl $< $@
+ $(srcdir)/bin2s.pl $< $@
depend: .depend
-.depend: $(SOURCES)
+.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) config.ml
rm -f $@ $@-t
- $(OCAMLFIND) ocamldep $^ | \
+ $(OCAMLFIND) ocamldep -I $(abs_srcdir) -I $(builddir) $^ | \
$(SED) 's/ *$$//' | \
$(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
- $(SED) 's/ :/:/' | \
+ $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
sort > $@-t
mv $@-t $@
@@ -167,7 +167,7 @@ SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
if HAVE_PERLDOC
-supermin.1: supermin.pod
+supermin.1: $(srcdir)/supermin.pod
pod2man \
-u \
--section 1 \
@@ -178,12 +178,12 @@ supermin.1: supermin.pod
noinst_DATA = \
../html/supermin.1.html
-../html/supermin.1.html: supermin.pod
+../html/supermin.1.html: $(srcdir)/supermin.pod
mkdir -p ../html
pod2html \
--css 'pod.css' \
--htmldir ../html \
--outfile ../html/supermin.1.html \
- supermin.pod
+ $<
endif
--
1.9.0
10 years, 6 months
