Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/readline/patches/readline_Makefile_in.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Tue, 19 Jul 2011 11:37:03 -0700
changeset 423 416940827b10
parent 131 651976f969f6
permissions -rw-r--r--
7067759 I cast Ressurect Libnet
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
131
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     1
 
--- readline-5.2/Makefile.in	2005-05-07 18:11:23.000000000 -0700
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     2
 
+++ solaris_nv/readline-5.2/Makefile.in	2007-11-01 03:18:19.344423000 -0700
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -219,11 +219,19 @@
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
 install:	$(INSTALL_TARGETS)
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     6
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
+# modification for solaris nv sfw-workspace nightly build
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
+# add a test before  "$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old"
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
 
+# add a test before "$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old"
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
 
+# otherwise there will be an error if *.a doesn't exist
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
 
 install-static: installdirs $(STATIC_LIBS) install-headers install-doc
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
 
-	-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    13
 
+	-( if test -f  $(DESTDIR)$(libdir)/libreadline.a ; then \
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    14
 
+		  $(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old ; \
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    15
 
+	fi )
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    16
 
 	$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    17
 
 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    18
 
-	-$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    19
 
+	-( if test -f  $(DESTDIR)$(libdir)/libhistory.a ; then \
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    20
 
+		 $(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old ; \
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    21
 
+	fi )
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    22
 
 	$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    23
 
 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
651976f969f6 7027351 move readline/gm4 to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    24
upstream/oracle/userland-gate