Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
Anders Lindh Olsson
e3-require
Commits
11c86a47
Commit
11c86a47
authored
8 years ago
by
Dirk Zimoch
Browse files
Options
Downloads
Patches
Plain Diff
fix for projects with the same name as a record
parent
8b2fa7cb
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
App/tools/driver.makefile
+2
-2
2 additions, 2 deletions
App/tools/driver.makefile
with
2 additions
and
2 deletions
App/tools/driver.makefile
+
2
−
2
View file @
11c86a47
...
@@ -777,10 +777,10 @@ EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
...
@@ -777,10 +777,10 @@ EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
$(
foreach
file,
${
SRCS
}
${
TEMPLS
}
${
SCR
}
,
$(
eval
vpath
$(
notdir
${
file
})
../
$(
dir
${
file
})))
$(
foreach
file,
${
SRCS
}
${
TEMPLS
}
${
SCR
}
,
$(
eval
vpath
$(
notdir
${
file
})
../
$(
dir
${
file
})))
# Do not treat %.dbd the same way because it creates a circular dependency
# Do not treat %.dbd the same way because it creates a circular dependency
# if a source dbd has the same name as the project dbd. Have to clear %.dbd.
# if a source dbd has the same name as the project dbd. Have to clear %.dbd
snd not use ../ path
.
# But the %Record.h and menu%.h rules need to find their dbd files (example: asyn)
# But the %Record.h and menu%.h rules need to find their dbd files (example: asyn)
vpath
%.dbd
vpath
%.dbd
vpath
%Record.dbd
${DBD_PATH}
vpath
%Record.dbd
$(
filter-out
../,
${
DBD_PATH
}
)
vpath
menu%.dbd
${DBD_PATH}
vpath
menu%.dbd
${DBD_PATH}
# find header files to install
# find header files to install
...
...
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