aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2014-12-12 16:49:45 -0800
committerJoshua Haberman <jhaberman@gmail.com>2014-12-12 16:49:45 -0800
commited52203481af7ede91b8706b2f8e9d58eecb9fbc (patch)
tree6a2fc1a9242659963b5f3bae9c146d957027f5e2 /src
parentf473bb9903370cc9324b0881873e0d0861f5d325 (diff)
parent91473dcebfbd90a8e256568e287e168b70c77ff0 (diff)
downloadprotobuf-ed52203481af7ede91b8706b2f8e9d58eecb9fbc.tar.gz
protobuf-ed52203481af7ede91b8706b2f8e9d58eecb9fbc.tar.bz2
protobuf-ed52203481af7ede91b8706b2f8e9d58eecb9fbc.zip
Merge pull request #134 from cfallin/master
Update Ruby build setup to produce gems successfully. Include upb as a single .c / .h file.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/compiler/ruby/ruby_generator.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/ruby/ruby_generator.cc b/src/google/protobuf/compiler/ruby/ruby_generator.cc
index 82ccd72b..e70425ff 100644
--- a/src/google/protobuf/compiler/ruby/ruby_generator.cc
+++ b/src/google/protobuf/compiler/ruby/ruby_generator.cc
@@ -261,7 +261,7 @@ void GenerateFile(const google::protobuf::FileDescriptor* file,
"filename", file->name());
printer->Print(
- "require 'protobuf'\n\n");
+ "require 'google/protobuf'\n\n");
for (int i = 0; i < file->dependency_count(); i++) {
const std::string& name = file->dependency(i)->name();