1 diff -Nru slang-1.4.3/modules/Makefile.in slang-1.4.3.new/modules/Makefile.in
2 --- slang-1.4.3/modules/Makefile.in Sun Feb 4 07:32:54 2001
3 +++ slang-1.4.3.new/modules/Makefile.in Tue Feb 6 11:05:57 2001
5 #---------------------------------------------------------------------------
6 # Installation location of the modules
7 #---------------------------------------------------------------------------
8 -MODULE_INSTALL_DIR = @libdir@/slang/modules
9 +MODULE_INSTALL_DIR = @libdir@/slang
11 INSTALL_DATA = @INSTALL_DATA@
12 MKINSDIR = ../autoconf/mkinsdir.sh
14 # DESTDIR is designed to facilitate making packages. Normally it is empty
15 #---------------------------------------------------------------------------
17 -DEST_MODULEDIR = $(DESTDIR)$(MODULE_INSTALL_DIR)
18 #---------------------------------------------------------------------------
22 $(CC_SHARED) $(INCS) fcntl-module.c -o fcntl-module.so $(LIBS)
25 - -$(MKINSDIR) $(DEST_MODULEDIR)
26 + -$(MKINSDIR) $(DESTDIR)$(MODULE_INSTALL_DIR)
27 @for i in $(MODULES); \
29 - echo $(INSTALL_DATA) $$i $(DEST_MODULEDIR); \
30 - $(INSTALL_DATA) $$i $(DEST_MODULEDIR); \
31 + echo $(INSTALL_DATA) $$i $(DESTDIR)$(MODULE_INSTALL_DIR); \
32 + $(INSTALL_DATA) $$i $(DESTDIR)$(MODULE_INSTALL_DIR); \
35 -/bin/rm -f $(MODULES) *~
36 diff -Nru slang-1.4.3/src/Makefile.in slang-1.4.3.new/src/Makefile.in
37 --- slang-1.4.3/src/Makefile.in Sun Feb 4 07:33:04 2001
38 +++ slang-1.4.3.new/src/Makefile.in Tue Feb 6 11:03:14 2001
40 #---------------------------------------------------------------------------
42 exec_prefix = @exec_prefix@
43 -install_lib_dir = @libdir@
44 -install_include_dir = @includedir@
46 +includedir = @includedir@
47 install_doc_dir = $(prefix)/doc/slang
48 DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
49 MODULE_INSTALL_DIR = @libdir@/slang/modules
51 # DESTDIR is designed to facilitate making packages. Normally it is empty
52 #---------------------------------------------------------------------------
54 -DEST_LIBDIR = $(DESTDIR)$(install_lib_dir)
55 -DEST_DOCDIR = $(DESTDIR)$(install_doc_dir)
56 -DEST_INCDIR = $(DESTDIR)$(install_include_dir)
58 #---------------------------------------------------------------------------
59 # Misc commands (safe to leave these untouched)
62 #---------------------------------------------------------------------------
63 install: install_basic_lib install_docs
64 -install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB)
65 - @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)
66 - $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
67 - $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
68 - @echo installing slang.h and slcurses.h in $(DEST_INCDIR)
69 - $(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR)
70 - $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)
72 +install_basic_lib: $(OBJDIR_NORMAL_LIB)
73 + $(MKINSDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
74 + @echo installing $(OBJDIR_NORMAL_LIB) in $(DESTDIR)$(libdir)
75 + $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DESTDIR)$(libdir)
76 + $(RANLIB) $(DESTDIR)/$(libdir)/$(NORMAL_LIB)
77 + @echo installing slang.h and slcurses.h in $(DESTDIR)$(includedir)
78 + $(INSTALL_DATA) $(SRCDIR)/slang.h $(DESTDIR)$(includedir)
79 + $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DESTDIR)$(includedir)
81 install_docs: $(DEST_DOCDIR)
82 + $(MKINSDIR) $(DESTDIR)$(install_doc_dir)
83 @for i in $(DOC_FILES); \
85 - echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
86 - $(INSTALL_DATA) $$i $(DEST_DOCDIR); \
87 + echo $(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir); \
88 + $(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir); \
91 - $(MKINSDIR) $(DEST_DOCDIR)
93 - $(MKINSDIR) $(DEST_INCDIR)
95 - $(MKINSDIR) $(DEST_LIBDIR)
97 install-elf: elf install
98 - -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
99 - -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
100 - @echo installing $(ELFLIB_MAJOR_MINOR) in $(DEST_LIBDIR)
101 - $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
102 + $(MKINSDIR) $(DESTDIR)$(libdir)
103 + @echo installing $(ELFLIB_MAJOR_MINOR) in $(DESTDIR)$(libdir)
104 + $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DESTDIR)$(libdir)
105 @echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
106 - -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
107 + -cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
109 - @echo $(ELFLIB_MAJOR_MINOR) created in $(DEST_LIBDIR).
110 + @echo $(ELFLIB_MAJOR_MINOR) created in $(DESTDIR)$(libdir).
111 @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
115 - -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
116 - -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
117 - cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
118 - cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
119 + cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
120 + cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
122 @echo A link $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) was created.
123 @echo A link $(ELFLIB) to $(ELFLIB_MAJOR) was created.