File: utils/util-linux/files/gar-base.diff
base-0 patch-1
Line 1Line 1
diff -Nru tmp/util-linux-2.11u/MCONFIG work/util-linux-2.11u/MCONFIG
--- tmp/util-linux-2.11u/MCONFIG        Thu Jul 4 14:40:07 2002
+++ work/util-linux-2.11u/MCONFIG        Tue Jul 9 12:00:56 2002
diff -Nru tmp/util-linux-2.11z/MCONFIG work/util-linux-2.11z/MCONFIG
--- tmp/util-linux-2.11z/MCONFIG        Thu Jul 4 14:40:07 2002
+++ work/util-linux-2.11z/MCONFIG        Tue Jul 9 12:00:56 2002
Line Line
# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd,
# and vipw will not be built or installed from the login-utils
# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd,
# and vipw will not be built or installed from the login-utils
Line 34Line 34

# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
# to the current user, allowing her to make a screendump and do other

# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
# to the current user, allowing her to make a screendump and do other
diff -Nru tmp/util-linux-2.11u/disk-utils/Makefile work/util-linux-2.11u/disk-utils/Makefile
--- tmp/util-linux-2.11u/disk-utils/Makefile        Thu Jul 4 17:40:02 2002
+++ work/util-linux-2.11u/disk-utils/Makefile        Tue Jul 9 12:00:37 2002
@@ -34,10 +34,10 @@
all: $(SBIN) $(USRBIN)

fsck.cramfs: fsck.cramfs.o
-        cc -o fsck.cramfs fsck.cramfs.o -lz
+        cc $(CFLAGS) -o fsck.cramfs fsck.cramfs.o -lz

mkfs.cramfs: mkfs.cramfs.o
-        cc -o mkfs.cramfs mkfs.cramfs.o -lz
+        cc $(CFLAGS) -o mkfs.cramfs mkfs.cramfs.o -lz

fsck.cramfs.o mkfs.cramfs.o: cramfs.h

diff -Nru tmp/util-linux-2.11u/login-utils/Makefile work/util-linux-2.11u/login-utils/Makefile
--- tmp/util-linux-2.11u/login-utils/Makefile        Sat Sep 29 11:11:24 2001
+++ work/util-linux-2.11u/login-utils/Makefile        Tue Jul 9 12:00:37 2002
diff -Nru tmp/util-linux-2.11z/login-utils/Makefile work/util-linux-2.11z/login-utils/Makefile
--- tmp/util-linux-2.11z/login-utils/Makefile        Sat Sep 29 11:11:24 2001
+++ work/util-linux-2.11z/login-utils/Makefile        Tue Jul 9 12:00:37 2002
Line Line
install-putils: $(BIN.PUTILS) $(USRBIN.PUTILS) $(USRSBIN.PUTILS)
        $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(USRSBINDIR)
install-putils: $(BIN.PUTILS) $(USRBIN.PUTILS) $(USRSBIN.PUTILS)
        $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(USRSBINDIR)
Line 73Line 57
        $(INSTALLDIR) $(MAN1DIR)
        $(INSTALLMAN) $(MAN1.PASSWD) $(MAN1DIR)

        $(INSTALLDIR) $(MAN1DIR)
        $(INSTALLMAN) $(MAN1.PASSWD) $(MAN1DIR)

diff -Nru tmp/util-linux-2.11u/misc-utils/Makefile work/util-linux-2.11u/misc-utils/Makefile
--- tmp/util-linux-2.11u/misc-utils/Makefile        Fri Apr 5 04:03:36 2002
+++ work/util-linux-2.11u/misc-utils/Makefile        Tue Jul 9 12:00:37 2002
diff -Nru tmp/util-linux-2.11z/misc-utils/Makefile work/util-linux-2.11z/misc-utils/Makefile
--- tmp/util-linux-2.11z/misc-utils/Makefile        Fri Apr 5 04:03:36 2002
+++ work/util-linux-2.11z/misc-utils/Makefile        Tue Jul 9 12:00:37 2002
Line Line
        $(INSTALLMAN) $(MAN1) $(MAN1DIR)
ifeq "$(HAVE_WRITE)" "no"
        $(INSTALLMAN) $(MAN1) $(MAN1DIR)
ifeq "$(HAVE_WRITE)" "no"
Line 88Line 72
endif
endif

endif
endif

diff -Nru tmp/util-linux-2.11u/mount/Makefile work/util-linux-2.11u/mount/Makefile
--- tmp/util-linux-2.11u/mount/Makefile        Sun Jul 7 05:56:31 2002
+++ work/util-linux-2.11u/mount/Makefile        Tue Jul 9 12:00:37 2002
diff -Nru tmp/util-linux-2.11z/mount/Makefile work/util-linux-2.11z/mount/Makefile
--- tmp/util-linux-2.11z/mount/Makefile        Sun Jul 7 05:56:31 2002
+++ work/util-linux-2.11z/mount/Makefile        Tue Jul 9 12:00:37 2002
Line Line

install: $(PROGS)

install: $(PROGS)