/[gentoo-alt]/trunk/sys-fs/e2fsprogs/files/e2fsprogs-1.36-makefile.patch
Gentoo

Contents of /trunk/sys-fs/e2fsprogs/files/e2fsprogs-1.36-makefile.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 665 - (show annotations) (download)
Wed Aug 24 11:19:51 2005 UTC (9 years, 2 months ago) by flameeyes
File size: 3546 byte(s)
Added e2fsprogs that installs on G/FBSD. See bug #103388.

1 --- Makefile.in
2 +++ Makefile.in
3 @@ -48,3 +48,3 @@
4 install-shlibs-libs-recursive install-doc-libs
5 - if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
6 + $(MAKE) install-libs
7
8 --- e2fsck/Makefile.in
9 +++ e2fsck/Makefile.in
10 @@ -163,6 +163,6 @@
11 @echo " LINK $(root_sbindir)/fsck.ext2"
12 - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
13 + @$(LN_S) -f e2fsck \
14 $(DESTDIR)$(root_sbindir)/fsck.ext2
15 @echo " LINK $(root_sbindir)/fsck.ext3"
16 - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
17 + @$(LN_S) -f e2fsck \
18 $(DESTDIR)$(root_sbindir)/fsck.ext3
19 @@ -176,6 +176,6 @@
20 @echo " LINK $(man8dir)/fsck.ext2.8"
21 - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
22 + @$(LN_S) -f e2fsck.8 \
23 $(DESTDIR)$(man8dir)/fsck.ext2.8
24 @echo " LINK $(man8dir)/fsck.ext3.8"
25 - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
26 + @$(LN_S) -f e2fsck.8 \
27 $(DESTDIR)$(man8dir)/fsck.ext3.8
28 --- misc/Makefile.in
29 +++ misc/Makefile.in
30 @@ -228,12 +228,12 @@
31 @echo " LINK $(root_sbindir)/mkfs.ext2"
32 - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
33 + @$(LN_S) -f mke2fs \
34 $(DESTDIR)$(root_sbindir)/mkfs.ext2
35 @echo " LINK $(root_sbindir)/mkfs.ext3"
36 - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
37 + @$(LN_S) -f mke2fs \
38 $(DESTDIR)$(root_sbindir)/mkfs.ext3
39 @echo " LINK $(root_sbindir)/e2label"
40 - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
41 + @$(LN_S) -f tune2fs \
42 $(DESTDIR)$(root_sbindir)/e2label
43 @echo " LINK $(root_sbindir)/findfs"
44 - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
45 + @$(LN_S) -f tune2fs \
46 $(DESTDIR)$(root_sbindir)/findfs
47 @@ -257,6 +257,6 @@
48 @echo " LINK mkfs.ext2.8"
49 - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
50 + @$(LN_S) -f mke2fs.8 \
51 $(DESTDIR)$(man8dir)/mkfs.ext2.8
52 @echo " LINK mkfs.ext3.8"
53 - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
54 + @$(LN_S) -f mke2fs.8 \
55 $(DESTDIR)$(man8dir)/mkfs.ext3.8
56 --- lib/uuid/Makefile.in
57 +++ lib/uuid/Makefile.in
58 @@ -148,5 +148,5 @@
59 @echo " LINK $(man3dir)/uuid_generate_random.3"
60 - @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
61 + @$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
62 @echo " LINK $(man3dir)/uuid_generate_time.3"
63 - @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
64 + @$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
65 @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
66 --- lib/Makefile.elf-lib
67 +++ lib/Makefile.elf-lib
68 @@ -26,7 +26,7 @@
69
70 $(ELF_LIB): $(OBJS)
71 @echo " GEN_ELF_SOLIB $(ELF_LIB)"
72 - @(cd elfshared; $(CC) --shared -o $(ELF_LIB) \
73 + @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
74 -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
75 @$(MV) elfshared/$(ELF_LIB) .
76 @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
77 @@ -49,3 +49,3 @@
78 @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
79 - @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
80 + @$(LN_S) -f $(ELF_SONAME) \
81 $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
82 --- util/Makefile.in
83 +++ util/Makefile.in
84 @@ -15,7 +15,7 @@
85
86 .c.o:
87 @echo " CC $<"
88 - @$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@
89 + @$(BUILD_CC) -c $(DEFS) $< -o $@
90
91 PROGS= subst
92
93 @@ -23,11 +23,11 @@
94
95 subst: subst.o
96 @echo " LD $@"
97 - @$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o
98 + @$(BUILD_CC) -o subst subst.o
99
100 copy_sparse: copy_sparse.o
101 @echo " LD $@"
102 - @$(BUILD_CC) $(ALL_LDFLAGS) -o copy_sparse copy_sparse.o
103 + @$(BUILD_CC) -o copy_sparse copy_sparse.o
104
105 gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
106 @echo " CONFIG.STATUS $@"

Properties

Name Value
svn:eol-style native
svn:keywords Author Date Id Revision

  ViewVC Help
Powered by ViewVC 1.1.20