Skip to content

Commit

Permalink
Simplify installation of OCaml header (.h) files
Browse files Browse the repository at this point in the history
The tools/cleanup-header script has no effect any more, so stop
calling it during make install and remove it from the repository.
  • Loading branch information
shindere committed Apr 26, 2017
1 parent e7cf3b1 commit 2557205
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 35 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Expand Up @@ -105,7 +105,6 @@ stdlib/Compflags text eol=lf
stdlib/sharpbang text eol=lf
tools/check-typo text eol=lf
tools/ci-build text eol=lf
tools/cleanup-header text eol=lf
tools/msvs-promote-path text eol=lf
tools/gdb-macros text eol=lf
tools/magic text eol=lf
Expand Down
8 changes: 3 additions & 5 deletions byterun/Makefile
Expand Up @@ -17,6 +17,7 @@ include ../config/Makefile

INSTALL_BINDIR=$(DESTDIR)$(BINDIR)
INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
INSTALL_INCDIR=$(INSTALL_LIBDIR)/caml

# The PROGRAMS (resp. LIBRARIES) variable list the files to build and
# install as programs in $(INSTALL_BINDIR) (resp. libraries in
Expand Down Expand Up @@ -105,11 +106,8 @@ ld.conf: ../config/Makefile
install:
cp $(PROGRAMS) "$(INSTALL_BINDIR)"
cp $(LIBRARIES) "$(INSTALL_LIBDIR)"
mkdir -p "$(INSTALL_LIBDIR)/caml"
for i in caml/*.h; do \
sed -f ../tools/cleanup-header $$i \
> "$(INSTALL_LIBDIR)/$$i"; \
done
mkdir -p "$(INSTALL_INCDIR)"
cp caml/*.h "$(INSTALL_INCDIR)"

# If primitives contain duplicated lines (e.g. because the code is defined
# like
Expand Down
29 changes: 0 additions & 29 deletions tools/cleanup-header

This file was deleted.

0 comments on commit 2557205

Please sign in to comment.