ncurses 5.9 - patch 20110813

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

diff --git a/mk-1st.awk b/mk-1st.awk
index 16537a685c760187e967b5b393b03a00071c9e72..c23066e3c446d6a6a02aac170db1f6331c1c11fb 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.84 2010/07/24 21:12:27 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"), #
@@ -396,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 \\"
@@ -436,7 +437,7 @@ 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) && "
-                                       symlink("libncurses.a" "libcurses.a")
+                                       symlink("libncurses.a", "libcurses.a")
                                        printf ")\n"
                                }
                                printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name