I believe it's both. Digestive enzymes are translated into the cisternae of the rough ER, then a transport vesicle is pinched off and goes to the Golgi. Only a fraction of the total enzymes are present in each transport vesicle, though. So when enough vesicles fuse with the golgi, all the enzymes are concentrated together, and then the lysosome is pinched off of the Golgi and goes to do its thang.