Merge pull request #11353 from kvuorine/fwknop-fixes
[feed/packages.git] / libs / serdisplib / patches / 010-cross-compile.patch
1 --- a/Makefile.in
2 +++ b/Makefile.in
3 @@ -44,8 +44,8 @@ all:
4 done && test -z "$$fail"
5
6 install:
7 - $(top_srcdir)/mkinstalldirs $(libdir)/pkgconfig
8 - $(INSTALL_DATA) serdisplib.pc $(libdir)/pkgconfig/
9 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
10 + $(INSTALL_DATA) serdisplib.pc $(DESTDIR)$(libdir)/pkgconfig/
11 @for dir in ${subdirs}; do \
12 (cd $(srcdir) && cd $$dir && $(MAKE) install) \
13 || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
14 --- a/server/Makefile.in
15 +++ b/server/Makefile.in
16 @@ -102,9 +102,9 @@ distclean: clean
17
18
19 install: $(PROGRAMS)
20 - $(top_srcdir)/mkinstalldirs $(bindir)
21 - $(top_srcdir)/mkinstalldirs $(sbindir)
22 - $(top_srcdir)/mkinstalldirs $(sysconfdir)
23 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
24 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
25 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
26 list='$(PROGRAMS_SBIN)'; \
27 for prog in $$list; do \
28 $(INSTALL_PROGRAM) $$prog $(sbindir)/ ; \
29 --- a/src/Makefile.in
30 +++ b/src/Makefile.in
31 @@ -28,7 +28,7 @@ includedir = @includedir@
32 datarootdir = @datarootdir@
33
34 CC=@CC@
35 -AR=@AR@ -r
36 +AR=@AR@
37 LN_S=@LN_S@
38 INSTALL=@INSTALL@
39 INSTALL_PROGRAM = @INSTALL_PROGRAM@
40 @@ -184,14 +184,14 @@ programs: $(PROGRAMS)
41 $(CC) $(CFLAGS) $(DEFINES) -c $<
42
43 $(LIB_DIR)/$(LIB_STATIC): $(LIB_OBJECTS)
44 - $(top_srcdir)/mkinstalldirs $(top_srcdir)/lib
45 - $(AR) $(LIB_DIR)/$(LIB_STATIC) $(LIB_OBJECTS)
46 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(top_srcdir)/lib
47 + $(AR) -r -- $(LIB_DIR)/$(LIB_STATIC) $(LIB_OBJECTS)
48
49 $(LIB_DIR)/$(LIB_SHARED): $(LIB_OBJECTS)
50 - $(top_srcdir)/mkinstalldirs $(top_srcdir)/lib
51 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(top_srcdir)/lib
52 $(CC) -fPIC -shared $(SONAME_FLAG) -o $(LIB_DIR)/$(LIB_SHARED) $(LIB_OBJECTS) $(LDFLAGS) $(EXTRA_LIBS)
53 - cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
54 - cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
55 + cd $(DESTDIR)$(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
56 + cd $(DESTDIR)$(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
57
58 testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
59 $(CC) -o testserdisp $(OBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
60 @@ -204,20 +204,20 @@ distclean: clean
61 /bin/rm -f Makefile
62
63 install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
64 - $(top_srcdir)/mkinstalldirs $(bindir)
65 - $(top_srcdir)/mkinstalldirs $(libdir)
66 - $(top_srcdir)/mkinstalldirs $(includedir)
67 - $(top_srcdir)/mkinstalldirs $(includedir)/serdisplib
68 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
69 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
70 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
71 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/serdisplib
72
73 - $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)/
74 - $(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(libdir)/
75 - $(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(libdir)/
76 + $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
77 + $(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
78 + $(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
79 list='$(LIB_HEADERFILES)'; \
80 for headerfile in $$list; do \
81 - $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(includedir)/serdisplib/ ; \
82 + $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
83 done
84 - cd $(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
85 - cd $(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
86 + cd $(DESTDIR)$(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
87 + cd $(DESTDIR)$(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
88
89 uninstall:
90 -/bin/rm -f $(libdir)/libserdisp*
91 --- a/tools/Makefile.in
92 +++ b/tools/Makefile.in
93 @@ -151,7 +151,7 @@ distclean: clean
94 install: $(PROGRAMS)
95 list='$(PROGRAMS)'; \
96 for prog in $$list; do \
97 - $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
98 + $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
99 done
100
101 uninstall: $(PROGRAMS)