Skip to content

Commit

Permalink
Trac #18715: Move fixed part of build/Makefile to build/deps
Browse files Browse the repository at this point in the history
The build rules (not the actual files) for the scripts and extcode
targets are "auto-generated" but they are really just one fixed block.
Move this to `build/deps` instead.

URL: http://trac.sagemath.org/18715
Reported by: jdemeyer
Ticket author(s): Jeroen Demeyer
Reviewer(s): Nathann Cohen
  • Loading branch information
Release Manager authored and vbraun committed Jun 17, 2015
2 parents af31216 + fa53538 commit cece6ce
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
17 changes: 17 additions & 0 deletions build/deps
Expand Up @@ -126,3 +126,20 @@ $(INST)/sage: \
$(PIPE) 'time $(MAKE) sage 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
touch $@; \
fi


###############################################################################
# Building scripts and extcode
###############################################################################

# Don't just use "install" since we don't want to change permissions
$(SAGE_LOCAL)/bin/%: $(SAGE_SRC)/bin/%
cp $< $@

# Don't just use "install -D" since we don't want to change permissions.
# cp won't correctly setup the SAGE_EXTCODE directory structure
# (unlike install), so we need a mkdir here such that cp can copy into
# an existing folder.
$(SAGE_EXTCODE)/%: $(SAGE_SRC)/ext/%
@mkdir -p "$(@D)"
cp $< $@
13 changes: 0 additions & 13 deletions build/install
Expand Up @@ -411,19 +411,6 @@ for file in `find "$SAGE_SRC"/ext -type f`; do
done
echo >&5

cat >&5 <<EOF
# don't just use \`install\` since we don't want to change permissions
\$(SAGE_LOCAL)/bin/%: \$(SAGE_SRC)/bin/%
cp \$< \$@
# don't just use \`install -D\` since we don't want to change permissions
# cp won't correctly setup the SAGE_EXTCODE directory structure (unlike install)
# so we need a mkdir here to cp can copy into an existing folder
\$(SAGE_EXTCODE)/%: \$(SAGE_SRC)/ext/%
@mkdir -p "\$(@D)"
cp \$< \$@
EOF

# Copy build/deps
cat >&5 <<EOF
Expand Down

0 comments on commit cece6ce

Please sign in to comment.