ncurses 5.9 - patch 20111210

[ncurses.git] / mk-1st.awk

diff --git a/mk-1st.awk b/mk-1st.awk
index 7d9390522895ac349826f866d602bf04506b5b14..c23066e3c446d6a6a02aac170db1f6331c1c11fb 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.83 2010/05/15 19:14:44 tom Exp $
+# $Id: mk-1st.awk,v 1.86 2011/07/02 18:04:15 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -40,8 +40,9 @@
 #      subset            ("none", "base", "base+ext_funcs" or "termlib", etc.)
 #      ShlibVer          ("rel", "abi" or "auto", to augment DoLinks variable)
 #      ShlibVerInfix ("yes" or "no", determines location of version #)
-#   TermlibRoot   ("tinfo" or other root for libterm.so)
-#   TermlibSuffix (".so" or other suffix for libterm.so)
+#      SymLink           ("ln -s", etc)
+#      TermlibRoot       ("tinfo" or other root for libterm.so)
+#      TermlibSuffix (".so" or other suffix for libterm.so)
 #      ReLink            ("yes", or "no", flag to rebuild shared libs on install)
 #      DoLinks           ("yes", "reverse" or "no", flag to add symbolic links)
 #      rmSoLocs          ("yes" or "no", flag to add extra clean target)
@@ -116,7 +117,9 @@ function end_name_of(a_name) {
        }
 function symlink(src,dst) {
                if ( src != dst ) {
-                       printf "rm -f %s; ", dst
+                       if ( SymLink !~ /.*-f.*/ ) {
+                               printf "rm -f %s; ", dst
+                       }
                        printf "$(LN_S) %s %s; ", src, dst
                }
        }
@@ -241,6 +244,7 @@ BEGIN       {
                                        printf "#  subset:        %s\n", subset 
                                        printf "#  ShlibVer:      %s\n", ShlibVer 
                                        printf "#  ShlibVerInfix: %s\n", ShlibVerInfix 
+                                       printf "#  SymLink:       %s\n", SymLink 
                                        printf "#  TermlibRoot:   %s\n", TermlibRoot 
                                        printf "#  TermlibSuffix: %s\n", TermlibSuffix 
                                        printf "#  ReLink:        %s\n", ReLink 
@@ -336,11 +340,15 @@ END       {
                                        if ( ShlibVer == "cygdll" ) {
                                                ovr_name = sprintf("libcurses%s.a", suffix)
                                                printf "\t@echo linking %s to %s\n", imp_name, ovr_name
-                                               printf "\tcd $(DESTDIR)$(libdir) && (rm -f %s; $(LN_S) %s %s; )\n", ovr_name, imp_name, ovr_name
+                                               printf "\tcd $(DESTDIR)$(libdir) && ("
+                                               symlink(imp_name, ovr_name)
+                                               printf ")\n"
                                        } else {
                                                ovr_name = sprintf("libcurses%s", suffix)
                                                printf "\t@echo linking %s to %s\n", end_name, ovr_name
-                                               printf "\tcd $(DESTDIR)$(libdir) && (rm -f %s; $(LN_S) %s %s; )\n", ovr_name, end_name, ovr_name
+                                               printf "\tcd $(DESTDIR)$(libdir) && ("
+                                               symlink(end_name, ovr_name)
+                                               printf ")\n"
                                        }
                                }
                                if ( ldconfig != "" && ldconfig != ":" ) {
@@ -388,12 +396,13 @@ END       {
                                end_name = lib_name;
                                printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
                                if ( is_ticlib() ) {
-                                       printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
+                                       which_list = "TICS_LIST";
                                } else if ( is_termlib() ) {
-                                       printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
+                                       which_list = "TINFO_LIST";
                                } else {
-                                       printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
+                                       which_list = "SHLIB_LIST";
                                }
+                               printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", compile, lib_name, OBJS, libtool_version, which_list
                                print  ""
                                print  "install \\"
                                print  "install.libs \\"
@@ -427,7 +436,9 @@ END {
                                {
                                        printf "\t@echo linking libcurses.a to libncurses.a\n"
                                        printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
-                                       printf "\t(cd $(DESTDIR)$(libdir) && $(LN_S) libncurses.a libcurses.a)\n"
+                                       printf "\t(cd $(DESTDIR)$(libdir) && "
+                                       symlink("libncurses.a", "libcurses.a")
+                                       printf ")\n"
                                }
                                printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
                                if ( host == "vxworks" )