about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-16 08:46:47 +0000
committerRoland McGrath <roland@gnu.org>1996-06-16 08:46:47 +0000
commit3433189e8a3934084db3945f1e9c0c8fa3f8f166 (patch)
tree798d5f1ce424d072420434f15155754e621f1a4d /sysdeps
parent6a441471712cfa78ae0b706b7d7529612b37338e (diff)
downloadglibc-3433189e8a3934084db3945f1e9c0c8fa3f8f166.tar.gz
glibc-3433189e8a3934084db3945f1e9c0c8fa3f8f166.tar.xz
glibc-3433189e8a3934084db3945f1e9c0c8fa3f8f166.zip
Sun Jun 16 03:22:49 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
	* sysdeps/unix/sysv/Makefile (sysdep_headers): Make append of termio.h
	and rule for it conditional on termio.h not already being in
	sysdep_headers.

	* rpm/Makefile (install-others) [libc.so-version]: Get libc.so from
	$(libdir), only the versioned named from $(slibdir).
	(instfiles): New variable.
	(glibc-$(version).$(config).rpm): New target.  Run rpm -bb.
	* rpm/rpmrc: New file.  A third of the options controlling rpm can
	only be given here (another third is on the command line, and a third
	cannot be specified in any way shape or form).
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/Makefile b/sysdeps/unix/sysv/Makefile
index 28542374f0..bc691e3163 100644
--- a/sysdeps/unix/sysv/Makefile
+++ b/sysdeps/unix/sysv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -16,7 +16,9 @@
 # not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 # Cambridge, MA 02139, USA.
 
-ifeq ($(subdir), misc)
+ifeq ($(subdir), termios)
+
+ifeq (,$(filter termio.h,$(sysdep_headers)))
 
 sysdep_headers := $(sysdep_headers) termio.h
 generated := $(generated) termio.h
@@ -34,6 +36,7 @@ $(objpfx)termio.h: $(..)sysdeps/unix/sysv/sysv_termio.h
 	mv $@-tmp $@
 
 endif
+endif
 
 # In SYSV style archives the symbol table member has an empty name.
 ar-symtab-name =