Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon
Commits
f6faa50a
Unverified
Commit
f6faa50a
authored
3 years ago
by
Martin Weinelt
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2337 from freifunk-gluon/makefile-fixes
parents
f7c04b57
286d07b3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+4
-3
4 additions, 3 deletions
Makefile
with
4 additions
and
3 deletions
Makefile
+
4
−
3
View file @
f6faa50a
...
...
@@ -19,8 +19,9 @@ escape = '$(subst ','\'',$(1))'
GLUON_SITEDIR
?=
site
$(
eval
$(
call mkabspath,GLUON_SITEDIR
))
$(GLUON_SITEDIR)/site.mk
:
$(
error No site configuration was found. Please check out a site configuration to
$(
GLUON_SITEDIR
))
ifeq
($(realpath $(GLUON_SITEDIR)/site.mk),)
$(
error
No site configuration was found. Please check out a site configuration to
$(
GLUON_SITEDIR
))
endif
include
$(GLUON_SITEDIR)/site.mk
...
...
@@ -70,7 +71,7 @@ GLUON_VARS = \
GLUON_VERSION GLUON_SITE_VERSION
\
GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_AUTOREMOVE GLUON_DEBUG GLUON_MINIFY GLUON_DEPRECATED
\
GLUON_DEVICES GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR GLUON_DEBUGDIR
\
GLUON_SITEDIR
GLUON_RELEASE
GLUON_AUTOUPDATER_BRANCH GLUON_AUTOUPDATER_ENABLED GLUON_LANGS GLUON_BASE_FEEDS
\
GLUON_SITEDIR GLUON_AUTOUPDATER_BRANCH GLUON_AUTOUPDATER_ENABLED GLUON_LANGS GLUON_BASE_FEEDS
\
GLUON_TARGET BOARD SUBTARGET
unexport
$(GLUON_VARS)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment